mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-07 04:33:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

PCM: Fix conflict of _snd_pcm_hw_params definitions

Browse source 
Fix the call of _snd_pcm_hw_params() to _snd_pcm_hw_params_internal().
The build passed wrongly because of _snd_pcm_hw_params define.
Having the same function name as the struct name is is simply
confusing...

Also, to be sure, _snd_pcm_hw_params is undef'ed in pcm_local.h, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-12-04 12:17:00 +01:00
parent 22d6b6e643
commit 03c26d0ede
8 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pcm/pcm.c
View file

@ -828,7 +828,7 @@ int snd_pcm_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
{ {
int err; int err;
assert(pcm && params); assert(pcm && params);
err = _snd_pcm_hw_params(pcm, params); err = _snd_pcm_hw_params_internal(pcm, params);
if (err < 0) if (err < 0)
return err; return err;
err = snd_pcm_prepare(pcm); err = snd_pcm_prepare(pcm);

2
src/pcm/pcm_file.c
View file

@ -602,7 +602,7 @@ static int snd_pcm_file_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)
snd_pcm_file_t *file = pcm->private_data; snd_pcm_file_t *file = pcm->private_data;
unsigned int channel; unsigned int channel;
snd_pcm_t *slave = file->gen.slave; snd_pcm_t *slave = file->gen.slave;
int err = _snd_pcm_hw_params(slave, params); int err = _snd_pcm_hw_params_internal(slave, params);
if (err < 0) if (err < 0)
return err; return err;
file->buffer_bytes = snd_pcm_frames_to_bytes(slave, slave->buffer_size); file->buffer_bytes = snd_pcm_frames_to_bytes(slave, slave->buffer_size);

2
src/pcm/pcm_generic.c
View file

@ -101,7 +101,7 @@ int snd_pcm_generic_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
int snd_pcm_generic_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) int snd_pcm_generic_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
{ {
snd_pcm_generic_t *generic = pcm->private_data; snd_pcm_generic_t *generic = pcm->private_data;
return _snd_pcm_hw_params(generic->slave, params); return _snd_pcm_hw_params_internal(generic->slave, params);
} }
int snd_pcm_generic_prepare(snd_pcm_t *pcm) int snd_pcm_generic_prepare(snd_pcm_t *pcm)

1
src/pcm/pcm_local.h
View file

@ -579,6 +579,7 @@ static inline int muldiv_near(int a, int b, int c)
int snd_pcm_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); int snd_pcm_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
int _snd_pcm_hw_params_internal(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); int _snd_pcm_hw_params_internal(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
#undef _snd_pcm_hw_params
int snd_pcm_hw_refine_soft(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); int snd_pcm_hw_refine_soft(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
int snd_pcm_hw_refine_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, int snd_pcm_hw_refine_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
int (*cprepare)(snd_pcm_t *pcm, int (*cprepare)(snd_pcm_t *pcm,

2
src/pcm/pcm_meter.c
View file

@ -419,7 +419,7 @@ static int snd_pcm_meter_hw_refine_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *pa
static int snd_pcm_meter_hw_params_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) static int snd_pcm_meter_hw_params_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
{ {
snd_pcm_meter_t *meter = pcm->private_data; snd_pcm_meter_t *meter = pcm->private_data;
return _snd_pcm_hw_params(meter->gen.slave, params); return _snd_pcm_hw_params_internal(meter->gen.slave, params);
} }
static int snd_pcm_meter_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) static int snd_pcm_meter_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)

4
src/pcm/pcm_mmap_emul.c
View file

@ -160,7 +160,7 @@ static int snd_pcm_mmap_emul_hw_params(snd_pcm_t *pcm,
snd_pcm_access_mask_t *pmask; snd_pcm_access_mask_t *pmask;
int err; int err;
err = _snd_pcm_hw_params(map->gen.slave, params); err = _snd_pcm_hw_params_internal(map->gen.slave, params);
if (err >= 0) { if (err >= 0) {
map->mmap_emul = 0; map->mmap_emul = 0;
return err; return err;
@ -186,7 +186,7 @@ static int snd_pcm_mmap_emul_hw_params(snd_pcm_t *pcm,
default: default:
goto _err; goto _err;
} }
err = _snd_pcm_hw_params(map->gen.slave, params); err = _snd_pcm_hw_params_internal(map->gen.slave, params);
if (err < 0) if (err < 0)
goto _err; goto _err;

2
src/pcm/pcm_plug.c
View file

@ -1040,7 +1040,7 @@ static int snd_pcm_plug_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
return err; return err;
} }
slave = plug->gen.slave; slave = plug->gen.slave;
err = _snd_pcm_hw_params(slave, params); err = _snd_pcm_hw_params_internal(slave, params);
if (err < 0) { if (err < 0) {
snd_pcm_plug_clear(pcm); snd_pcm_plug_clear(pcm);
return err; return err;

2
src/pcm/pcm_share.c
View file

@ -595,7 +595,7 @@ static int snd_pcm_share_hw_refine_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *pa
static int snd_pcm_share_hw_params_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) static int snd_pcm_share_hw_params_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
{ {
snd_pcm_share_t *share = pcm->private_data; snd_pcm_share_t *share = pcm->private_data;
return _snd_pcm_hw_params(share->slave->pcm, params); return _snd_pcm_hw_params_internal(share->slave->pcm, params);
} }
static int snd_pcm_share_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) static int snd_pcm_share_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)