mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Better retry code

Browse source
This commit is contained in:
Abramo Bagnara 2000-07-14 09:30:34 +00:00
parent 6c5be90f2d
commit 3031f2c48f
1 changed files with 14 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/pcm/pcm_plug.c
View file

@ -670,44 +670,17 @@ static int snd_pcm_plug_params(void *private, snd_pcm_params_t *params)
&slave_params.format)) < 0) &slave_params.format)) < 0)
return err; return err;
if (!plug->first) {
err = snd_pcm_params(plug->slave, params);
if (err < 0)
return err;
req_format = &params->format;
real_format = &plug->slave->setup.format;
if (real_format->interleave != req_format->interleave ||
real_format->format != req_format->format ||
real_format->rate != req_format->rate ||
real_format->channels != req_format->channels) {
assert(first);
slave_params.format = *real_format;
first = 0;
goto retry;
}
*plug->handle->ops = *plug->slave->ops;
plug->handle->ops->params = snd_pcm_plug_params;
plug->handle->ops->setup = snd_pcm_plug_setup;
plug->handle->ops->info = snd_pcm_plug_info;
plug->handle->ops->params_info = snd_pcm_plug_params_info;
plug->handle->op_arg = plug->slave->op_arg;
return 0;
}
*plug->handle->ops = snd_pcm_plug_ops;
plug->handle->op_arg = plug;
/* compute right sizes */ /* compute right sizes */
snd_pcm_plug_slave_params(plug, params, &slave_params); snd_pcm_plug_slave_params(plug, params, &slave_params);
pdprintf("params requested params: format = %i, rate = %i, channels = %i\n", slave_params.format.format, slave_params.format.rate, slave_params.format.channels); pdprintf("params requested params: format = %i, rate = %i, channels = %i\n", slave_params.format.format, slave_params.format.rate, slave_params.format.channels);
err = snd_pcm_params(plug->slave, &slave_params); err = snd_pcm_params(plug->slave, &slave_params);
if (err < 0) { if (err < 0) {
params->fail_mask = slave_params.fail_mask; params->fail_mask = slave_params.fail_mask;
params->fail_reason = slave_params.fail_reason; params->fail_reason = slave_params.fail_reason;
return err; return err;
} }
req_format = &slave_params.format; req_format = &slave_params.format;
real_format = &plug->slave->setup.format; real_format = &plug->slave->setup.format;
if (real_format->interleave != req_format->interleave || if (real_format->interleave != req_format->interleave ||
@ -720,6 +693,19 @@ static int snd_pcm_plug_params(void *private, snd_pcm_params_t *params)
goto retry; goto retry;
} }
if (!plug->first) {
*plug->handle->ops = *plug->slave->ops;
plug->handle->ops->params = snd_pcm_plug_params;
plug->handle->ops->setup = snd_pcm_plug_setup;
plug->handle->ops->info = snd_pcm_plug_info;
plug->handle->ops->params_info = snd_pcm_plug_params_info;
plug->handle->op_arg = plug->slave->op_arg;
return 0;
}
*plug->handle->ops = snd_pcm_plug_ops;
plug->handle->op_arg = plug;
/* /*
* I/O plugins * I/O plugins
*/ */