Uniformed arguments order

diff --git a/src/pcm/pcm_adpcm.c b/src/pcm/pcm_adpcm.c
index 0690cc85ec0caedba6acc055ae8fa3dfed8420a1..dd32c5ad9dc864b85598f13da8e16b08bff55a82 100644 (file)
--- a/src/pcm/pcm_adpcm.c
+++ b/src/pcm/pcm_adpcm.c
@@ -60,7 +60,7 @@ typedef void (*adpcm_f)(const snd_pcm_channel_area_t *src_areas,
                        size_t src_offset,
                        const snd_pcm_channel_area_t *dst_areas,
                        size_t dst_offset,
-                       size_t frames, size_t channels, int getputidx,
+                       size_t channels, size_t frames, int getputidx,
                        adpcm_state_t *states);
 
 typedef struct {
@@ -199,7 +199,7 @@ static void adpcm_decode(const snd_pcm_channel_area_t *src_areas,
                         size_t src_offset,
                         const snd_pcm_channel_area_t *dst_areas,
                         size_t dst_offset,
-                        size_t frames, size_t channels, int putidx,
+                        size_t channels, size_t frames, int putidx,
                         adpcm_state_t *states)
 {
 #define PUT16_LABELS
@@ -260,7 +260,7 @@ static void adpcm_encode(const snd_pcm_channel_area_t *src_areas,
                         size_t src_offset,
                         const snd_pcm_channel_area_t *dst_areas,
                         size_t dst_offset,
-                        size_t frames, size_t channels, int getidx,
+                        size_t channels, size_t frames, int getidx,
                         adpcm_state_t *states)
 {
 #define GET16_LABELS
@@ -426,7 +426,7 @@ static ssize_t snd_pcm_adpcm_write_areas(snd_pcm_t *pcm,
                size_t frames = snd_pcm_mmap_playback_xfer(slave, size - xfer);
                adpcm->func(areas, offset, 
                            snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
-                           frames, pcm->channels,
+                           pcm->channels, frames,
                            adpcm->getput_idx, adpcm->states);
                err = snd_pcm_mmap_forward(slave, frames);
                if (err < 0)
@@ -461,7 +461,7 @@ static ssize_t snd_pcm_adpcm_read_areas(snd_pcm_t *pcm,
                size_t frames = snd_pcm_mmap_capture_xfer(slave, size - xfer);
                adpcm->func(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
                            areas, offset, 
-                           frames, pcm->channels,
+                           pcm->channels, frames,
                            adpcm->getput_idx, adpcm->states);
                err = snd_pcm_mmap_forward(slave, frames);
                if (err < 0)

diff --git a/src/pcm/pcm_alaw.c b/src/pcm/pcm_alaw.c
index 0b6c7775ddf246ba4d3ffbc8a9d7fdfc7b629e8a..a6428775e5fd0123c23895b8f1e4a1d1d005d6d2 100644 (file)
--- a/src/pcm/pcm_alaw.c
+++ b/src/pcm/pcm_alaw.c
@@ -27,7 +27,7 @@ typedef void (*alaw_f)(const snd_pcm_channel_area_t *src_areas,
                        size_t src_offset,
                        const snd_pcm_channel_area_t *dst_areas,
                        size_t dst_offset,
-                       size_t frames, size_t channels, int getputidx);
+                       size_t channels, size_t frames, int getputidx);
 
 typedef struct {
        /* This field need to be the first */
@@ -124,7 +124,7 @@ static void alaw_decode(const snd_pcm_channel_area_t *src_areas,
                        size_t src_offset,
                        const snd_pcm_channel_area_t *dst_areas,
                        size_t dst_offset,
-                       size_t frames, size_t channels, int putidx)
+                       size_t channels, size_t frames, int putidx)
 {
 #define PUT16_LABELS
 #include "plugin_ops.h"
@@ -169,7 +169,7 @@ static void alaw_encode(const snd_pcm_channel_area_t *src_areas,
                         size_t src_offset,
                         const snd_pcm_channel_area_t *dst_areas,
                         size_t dst_offset,
-                        size_t frames, size_t channels, int getidx)
+                        size_t channels, size_t frames, int getidx)
 {
 #define GET16_LABELS
 #include "plugin_ops.h"
@@ -294,7 +294,7 @@ static ssize_t snd_pcm_alaw_write_areas(snd_pcm_t *pcm,
                size_t frames = snd_pcm_mmap_playback_xfer(slave, size - xfer);
                alaw->func(areas, offset, 
                            snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
-                           frames, pcm->channels,
+                           pcm->channels, frames,
                            alaw->getput_idx);
                err = snd_pcm_mmap_forward(slave, frames);
                if (err < 0)
@@ -329,7 +329,7 @@ static ssize_t snd_pcm_alaw_read_areas(snd_pcm_t *pcm,
                size_t frames = snd_pcm_mmap_capture_xfer(slave, size - xfer);
                alaw->func(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
                           areas, offset, 
-                          frames, pcm->channels,
+                          pcm->channels, frames,
                           alaw->getput_idx);
                err = snd_pcm_mmap_forward(slave, frames);
                if (err < 0)

diff --git a/src/pcm/pcm_linear.c b/src/pcm/pcm_linear.c
index b7f1440954c9068adf6d78cd47de4df5ba9062e8..50c3e603c495202c5b34c4847a612a1beeec98b2 100644 (file)
--- a/src/pcm/pcm_linear.c
+++ b/src/pcm/pcm_linear.c
@@ -32,7 +32,7 @@ typedef struct {
 
 static void linear_transfer(const snd_pcm_channel_area_t *src_areas, size_t src_offset,
                            const snd_pcm_channel_area_t *dst_areas, size_t dst_offset,
-                           size_t frames, size_t channels, int convidx)
+                           size_t channels, size_t frames, int convidx)
 {
 #define CONV_LABELS
 #include "plugin_ops.h"
@@ -141,7 +141,7 @@ static ssize_t snd_pcm_linear_write_areas(snd_pcm_t *pcm,
                size_t frames = snd_pcm_mmap_playback_xfer(slave, size - xfer);
                linear_transfer(areas, offset, 
                                snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
-                               frames, pcm->channels, linear->conv_idx);
+                               pcm->channels, frames, linear->conv_idx);
                err = snd_pcm_mmap_forward(slave, frames);
                if (err < 0)
                        break;
@@ -175,7 +175,7 @@ static ssize_t snd_pcm_linear_read_areas(snd_pcm_t *pcm,
                size_t frames = snd_pcm_mmap_capture_xfer(slave, size - xfer);
                linear_transfer(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
                                areas, offset, 
-                               frames, pcm->channels, linear->conv_idx);
+                               pcm->channels, frames, linear->conv_idx);
                err = snd_pcm_mmap_forward(slave, frames);
                if (err < 0)
                        break;

diff --git a/src/pcm/pcm_mulaw.c b/src/pcm/pcm_mulaw.c
index 3f114bd0b7569f34a324756e77f17ec246f3e3ed..abefeacb601f1c57e416de6a2b0c7c4b557b48a5 100644 (file)
--- a/src/pcm/pcm_mulaw.c
+++ b/src/pcm/pcm_mulaw.c
@@ -27,7 +27,7 @@ typedef void (*mulaw_f)(const snd_pcm_channel_area_t *src_areas,
                        size_t src_offset,
                        const snd_pcm_channel_area_t *dst_areas,
                        size_t dst_offset,
-                       size_t frames, size_t channels, int getputidx);
+                       size_t channels, size_t frames, int getputidx);
 
 typedef struct {
        /* This field need to be the first */
@@ -141,7 +141,7 @@ static void mulaw_decode(const snd_pcm_channel_area_t *src_areas,
                         size_t src_offset,
                         const snd_pcm_channel_area_t *dst_areas,
                         size_t dst_offset,
-                        size_t frames, size_t channels, int putidx)
+                        size_t channels, size_t frames, int putidx)
 {
 #define PUT16_LABELS
 #include "plugin_ops.h"
@@ -186,7 +186,7 @@ static void mulaw_encode(const snd_pcm_channel_area_t *src_areas,
                         size_t src_offset,
                         const snd_pcm_channel_area_t *dst_areas,
                         size_t dst_offset,
-                        size_t frames, size_t channels, int getidx)
+                        size_t channels, size_t frames, int getidx)
 {
 #define GET16_LABELS
 #include "plugin_ops.h"
@@ -311,7 +311,7 @@ static ssize_t snd_pcm_mulaw_write_areas(snd_pcm_t *pcm,
                size_t frames = snd_pcm_mmap_playback_xfer(slave, size - xfer);
                mulaw->func(areas, offset, 
                            snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
-                           frames, pcm->channels,
+                           pcm->channels, frames,
                            mulaw->getput_idx);
                err = snd_pcm_mmap_forward(slave, frames);
                if (err < 0)
@@ -346,7 +346,7 @@ static ssize_t snd_pcm_mulaw_read_areas(snd_pcm_t *pcm,
                size_t frames = snd_pcm_mmap_capture_xfer(slave, size - xfer);
                mulaw->func(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
                            areas, offset, 
-                           frames, pcm->channels,
+                           pcm->channels, frames,
                            mulaw->getput_idx);
                err = snd_pcm_mmap_forward(slave, frames);
                if (err < 0)

diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
index 8d1cb64166c66e8021bea6666a52d95ce9cbe81e..d9eb379cd150d1a6d9c98e587d14d610b835ad6e 100644 (file)
--- a/src/pcm/pcm_route.c
+++ b/src/pcm/pcm_route.c
@@ -386,8 +386,8 @@ static void route_transfer(const snd_pcm_channel_area_t *src_areas,
                           size_t src_offset,
                           const snd_pcm_channel_area_t *dst_areas,
                           size_t dst_offset,
-                          size_t frames,
                           size_t dst_channels,
+                          size_t frames,
                           route_params_t *params)
 {
        size_t dst_channel;
@@ -530,7 +530,7 @@ static ssize_t snd_pcm_route_write_areas(snd_pcm_t *pcm,
                size_t frames = snd_pcm_mmap_playback_xfer(slave, size - xfer);
                route_transfer(areas, offset, 
                               snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
-                              frames, slave->channels, &route->params);
+                              slave->channels, frames, &route->params);
                err = snd_pcm_mmap_forward(slave, frames);
                if (err < 0)
                        break;
@@ -564,7 +564,7 @@ static ssize_t snd_pcm_route_read_areas(snd_pcm_t *pcm,
                size_t frames = snd_pcm_mmap_capture_xfer(slave, size - xfer);
                route_transfer(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
                               areas, offset, 
-                              frames, pcm->channels, &route->params);
+                              pcm->channels, frames, &route->params);
                err = snd_pcm_mmap_forward(slave, frames);
                if (err < 0)
                        break;