Uniformed arguments order

This commit is contained in:
Abramo Bagnara 2000-12-11 11:17:26 +00:00
parent e72ac5eab4
commit a07e3c967b
5 changed files with 21 additions and 21 deletions

View file

@ -60,7 +60,7 @@ typedef void (*adpcm_f)(const snd_pcm_channel_area_t *src_areas,
size_t src_offset, size_t src_offset,
const snd_pcm_channel_area_t *dst_areas, const snd_pcm_channel_area_t *dst_areas,
size_t dst_offset, size_t dst_offset,
size_t frames, size_t channels, int getputidx, size_t channels, size_t frames, int getputidx,
adpcm_state_t *states); adpcm_state_t *states);
typedef struct { typedef struct {
@ -199,7 +199,7 @@ static void adpcm_decode(const snd_pcm_channel_area_t *src_areas,
size_t src_offset, size_t src_offset,
const snd_pcm_channel_area_t *dst_areas, const snd_pcm_channel_area_t *dst_areas,
size_t dst_offset, size_t dst_offset,
size_t frames, size_t channels, int putidx, size_t channels, size_t frames, int putidx,
adpcm_state_t *states) adpcm_state_t *states)
{ {
#define PUT16_LABELS #define PUT16_LABELS
@ -260,7 +260,7 @@ static void adpcm_encode(const snd_pcm_channel_area_t *src_areas,
size_t src_offset, size_t src_offset,
const snd_pcm_channel_area_t *dst_areas, const snd_pcm_channel_area_t *dst_areas,
size_t dst_offset, size_t dst_offset,
size_t frames, size_t channels, int getidx, size_t channels, size_t frames, int getidx,
adpcm_state_t *states) adpcm_state_t *states)
{ {
#define GET16_LABELS #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); size_t frames = snd_pcm_mmap_playback_xfer(slave, size - xfer);
adpcm->func(areas, offset, adpcm->func(areas, offset,
snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
frames, pcm->channels, pcm->channels, frames,
adpcm->getput_idx, adpcm->states); adpcm->getput_idx, adpcm->states);
err = snd_pcm_mmap_forward(slave, frames); err = snd_pcm_mmap_forward(slave, frames);
if (err < 0) 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); size_t frames = snd_pcm_mmap_capture_xfer(slave, size - xfer);
adpcm->func(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), adpcm->func(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
areas, offset, areas, offset,
frames, pcm->channels, pcm->channels, frames,
adpcm->getput_idx, adpcm->states); adpcm->getput_idx, adpcm->states);
err = snd_pcm_mmap_forward(slave, frames); err = snd_pcm_mmap_forward(slave, frames);
if (err < 0) if (err < 0)

View file

@ -27,7 +27,7 @@ typedef void (*alaw_f)(const snd_pcm_channel_area_t *src_areas,
size_t src_offset, size_t src_offset,
const snd_pcm_channel_area_t *dst_areas, const snd_pcm_channel_area_t *dst_areas,
size_t dst_offset, size_t dst_offset,
size_t frames, size_t channels, int getputidx); size_t channels, size_t frames, int getputidx);
typedef struct { typedef struct {
/* This field need to be the first */ /* 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, size_t src_offset,
const snd_pcm_channel_area_t *dst_areas, const snd_pcm_channel_area_t *dst_areas,
size_t dst_offset, size_t dst_offset,
size_t frames, size_t channels, int putidx) size_t channels, size_t frames, int putidx)
{ {
#define PUT16_LABELS #define PUT16_LABELS
#include "plugin_ops.h" #include "plugin_ops.h"
@ -169,7 +169,7 @@ static void alaw_encode(const snd_pcm_channel_area_t *src_areas,
size_t src_offset, size_t src_offset,
const snd_pcm_channel_area_t *dst_areas, const snd_pcm_channel_area_t *dst_areas,
size_t dst_offset, size_t dst_offset,
size_t frames, size_t channels, int getidx) size_t channels, size_t frames, int getidx)
{ {
#define GET16_LABELS #define GET16_LABELS
#include "plugin_ops.h" #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); size_t frames = snd_pcm_mmap_playback_xfer(slave, size - xfer);
alaw->func(areas, offset, alaw->func(areas, offset,
snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
frames, pcm->channels, pcm->channels, frames,
alaw->getput_idx); alaw->getput_idx);
err = snd_pcm_mmap_forward(slave, frames); err = snd_pcm_mmap_forward(slave, frames);
if (err < 0) 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); size_t frames = snd_pcm_mmap_capture_xfer(slave, size - xfer);
alaw->func(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), alaw->func(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
areas, offset, areas, offset,
frames, pcm->channels, pcm->channels, frames,
alaw->getput_idx); alaw->getput_idx);
err = snd_pcm_mmap_forward(slave, frames); err = snd_pcm_mmap_forward(slave, frames);
if (err < 0) if (err < 0)

View file

@ -32,7 +32,7 @@ typedef struct {
static void linear_transfer(const snd_pcm_channel_area_t *src_areas, size_t src_offset, 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, 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 #define CONV_LABELS
#include "plugin_ops.h" #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); size_t frames = snd_pcm_mmap_playback_xfer(slave, size - xfer);
linear_transfer(areas, offset, linear_transfer(areas, offset,
snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), 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); err = snd_pcm_mmap_forward(slave, frames);
if (err < 0) if (err < 0)
break; 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); size_t frames = snd_pcm_mmap_capture_xfer(slave, size - xfer);
linear_transfer(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), linear_transfer(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
areas, offset, areas, offset,
frames, pcm->channels, linear->conv_idx); pcm->channels, frames, linear->conv_idx);
err = snd_pcm_mmap_forward(slave, frames); err = snd_pcm_mmap_forward(slave, frames);
if (err < 0) if (err < 0)
break; break;

View file

@ -27,7 +27,7 @@ typedef void (*mulaw_f)(const snd_pcm_channel_area_t *src_areas,
size_t src_offset, size_t src_offset,
const snd_pcm_channel_area_t *dst_areas, const snd_pcm_channel_area_t *dst_areas,
size_t dst_offset, size_t dst_offset,
size_t frames, size_t channels, int getputidx); size_t channels, size_t frames, int getputidx);
typedef struct { typedef struct {
/* This field need to be the first */ /* 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, size_t src_offset,
const snd_pcm_channel_area_t *dst_areas, const snd_pcm_channel_area_t *dst_areas,
size_t dst_offset, size_t dst_offset,
size_t frames, size_t channels, int putidx) size_t channels, size_t frames, int putidx)
{ {
#define PUT16_LABELS #define PUT16_LABELS
#include "plugin_ops.h" #include "plugin_ops.h"
@ -186,7 +186,7 @@ static void mulaw_encode(const snd_pcm_channel_area_t *src_areas,
size_t src_offset, size_t src_offset,
const snd_pcm_channel_area_t *dst_areas, const snd_pcm_channel_area_t *dst_areas,
size_t dst_offset, size_t dst_offset,
size_t frames, size_t channels, int getidx) size_t channels, size_t frames, int getidx)
{ {
#define GET16_LABELS #define GET16_LABELS
#include "plugin_ops.h" #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); size_t frames = snd_pcm_mmap_playback_xfer(slave, size - xfer);
mulaw->func(areas, offset, mulaw->func(areas, offset,
snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
frames, pcm->channels, pcm->channels, frames,
mulaw->getput_idx); mulaw->getput_idx);
err = snd_pcm_mmap_forward(slave, frames); err = snd_pcm_mmap_forward(slave, frames);
if (err < 0) 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); size_t frames = snd_pcm_mmap_capture_xfer(slave, size - xfer);
mulaw->func(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), mulaw->func(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
areas, offset, areas, offset,
frames, pcm->channels, pcm->channels, frames,
mulaw->getput_idx); mulaw->getput_idx);
err = snd_pcm_mmap_forward(slave, frames); err = snd_pcm_mmap_forward(slave, frames);
if (err < 0) if (err < 0)

View file

@ -386,8 +386,8 @@ static void route_transfer(const snd_pcm_channel_area_t *src_areas,
size_t src_offset, size_t src_offset,
const snd_pcm_channel_area_t *dst_areas, const snd_pcm_channel_area_t *dst_areas,
size_t dst_offset, size_t dst_offset,
size_t frames,
size_t dst_channels, size_t dst_channels,
size_t frames,
route_params_t *params) route_params_t *params)
{ {
size_t dst_channel; 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); size_t frames = snd_pcm_mmap_playback_xfer(slave, size - xfer);
route_transfer(areas, offset, route_transfer(areas, offset,
snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), 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); err = snd_pcm_mmap_forward(slave, frames);
if (err < 0) if (err < 0)
break; 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); size_t frames = snd_pcm_mmap_capture_xfer(slave, size - xfer);
route_transfer(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave), route_transfer(snd_pcm_mmap_areas(slave), snd_pcm_mmap_offset(slave),
areas, offset, areas, offset,
frames, pcm->channels, &route->params); pcm->channels, frames, &route->params);
err = snd_pcm_mmap_forward(slave, frames); err = snd_pcm_mmap_forward(slave, frames);
if (err < 0) if (err < 0)
break; break;