mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-12-18 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed repeated prepare call

Browse source
This commit is contained in:
Abramo Bagnara 2001-02-05 09:35:17 +00:00
parent 4ecd9eaa46
commit a83b209df2
6 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pcm/pcm_file.c
View file

@ -307,7 +307,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; snd_pcm_file_t *file = pcm->private;
unsigned int channel; unsigned int channel;
snd_pcm_t *slave = file->slave; snd_pcm_t *slave = file->slave;
int err = snd_pcm_hw_params(slave, params); int err = _snd_pcm_hw_params(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);

1
src/pcm/pcm_local.h
View file

@ -336,6 +336,7 @@ static inline int muldiv_near(int a, int b, int c)
return n; return n;
} }
int _snd_pcm_hw_params(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_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,

10
src/pcm/pcm_params.c
View file

@ -2099,7 +2099,7 @@ int snd_pcm_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
max periods max periods
Return 0 on success or a negative number expressing the error. Return 0 on success or a negative number expressing the error.
*/ */
int snd_pcm_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) int _snd_pcm_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
{ {
int err; int err;
snd_pcm_sw_params_t sw; snd_pcm_sw_params_t sw;
@ -2154,6 +2154,14 @@ int snd_pcm_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
pcm->access == SND_PCM_ACCESS_MMAP_COMPLEX) { pcm->access == SND_PCM_ACCESS_MMAP_COMPLEX) {
err = snd_pcm_mmap(pcm); err = snd_pcm_mmap(pcm);
} }
return err;
}
int snd_pcm_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
{
int err;
assert(pcm && params);
err = _snd_pcm_hw_params(pcm, params);
if (err >= 0) if (err >= 0)
err = snd_pcm_prepare(pcm); err = snd_pcm_prepare(pcm);
return err; return err;

2
src/pcm/pcm_plug.c
View file

@ -583,7 +583,7 @@ static int snd_pcm_plug_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
return err; return err;
} }
slave = plug->slave; slave = plug->slave;
err = snd_pcm_hw_params(slave, params); err = _snd_pcm_hw_params(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_plugin.c
View file

@ -349,7 +349,7 @@ int snd_pcm_plugin_hw_refine_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
int snd_pcm_plugin_hw_params_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) int snd_pcm_plugin_hw_params_slave(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
{ {
snd_pcm_plugin_t *plugin = pcm->private; snd_pcm_plugin_t *plugin = pcm->private;
return snd_pcm_hw_params(plugin->slave, params); return _snd_pcm_hw_params(plugin->slave, params);
} }
snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops = { snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops = {

2
src/pcm/pcm_share.c
View file

@ -570,7 +570,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; snd_pcm_share_t *share = pcm->private;
return snd_pcm_hw_params(share->slave->pcm, params); return _snd_pcm_hw_params(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)