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

Changed priority basing upon weight

Browse source
This commit is contained in:
Abramo Bagnara 2000-10-10 11:17:23 +00:00
parent 25fc3663fa
commit 6deca73913
1 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/pcm/pcm_plug.c
View file

@ -506,35 +506,6 @@ static int snd_pcm_plug_params(snd_pcm_t *pcm, snd_pcm_params_t *params)
format = &params->format; format = &params->format;
slave_format = &slave_info.req.format; slave_format = &slave_info.req.format;
if ((slave_info.formats & (1 << format->sfmt)) == 0) {
int slave_fmt = snd_pcm_plug_slave_fmt(format->sfmt, &slave_info);
if (slave_fmt < 0) {
params->fail_mask = SND_PCM_PARAMS_SFMT;
params->fail_reason = SND_PCM_PARAMS_FAIL_INVAL;
return slave_fmt;
}
slave_format->sfmt = slave_fmt;
}
slave_info.req_mask |= SND_PCM_PARAMS_SFMT;
if (slave_info.formats != 1U << slave_format->sfmt) {
err = snd_pcm_params_info(slave, &slave_info);
assert(err >= 0);
if (err < 0)
return err;
}
if (format->channels < slave_info.min_channels)
slave_format->channels = slave_info.min_channels;
else if (format->channels > slave_info.max_channels)
slave_format->channels = slave_info.max_channels;
slave_info.req_mask |= SND_PCM_PARAMS_CHANNELS;
err = snd_pcm_params_info(slave, &slave_info);
assert(err >= 0);
if (err < 0)
return err;
srate = snd_pcm_plug_slave_rate(format->rate, &slave_info); srate = snd_pcm_plug_slave_rate(format->rate, &slave_info);
if (srate < 0) { if (srate < 0) {
params->fail_mask = SND_PCM_PARAMS_RATE; params->fail_mask = SND_PCM_PARAMS_RATE;
@ -553,6 +524,34 @@ static int snd_pcm_plug_params(snd_pcm_t *pcm, snd_pcm_params_t *params)
else else
slave_format->rate = slave_info.max_rate; slave_format->rate = slave_info.max_rate;
if (format->channels < slave_info.min_channels)
slave_format->channels = slave_info.min_channels;
else if (format->channels > slave_info.max_channels)
slave_format->channels = slave_info.max_channels;
slave_info.req_mask |= SND_PCM_PARAMS_CHANNELS;
err = snd_pcm_params_info(slave, &slave_info);
assert(err >= 0);
if (err < 0)
return err;
if ((slave_info.formats & (1 << format->sfmt)) == 0) {
int slave_fmt = snd_pcm_plug_slave_fmt(format->sfmt, &slave_info);
if (slave_fmt < 0) {
params->fail_mask = SND_PCM_PARAMS_SFMT;
params->fail_reason = SND_PCM_PARAMS_FAIL_INVAL;
return slave_fmt;
}
slave_format->sfmt = slave_fmt;
}
slave_info.req_mask |= SND_PCM_PARAMS_SFMT;
if (slave_info.formats != 1U << slave_format->sfmt) {
err = snd_pcm_params_info(slave, &slave_info);
assert(err >= 0);
if (err < 0)
return err;
}
err = snd_pcm_plug_insert_plugins(pcm, format, slave_format); err = snd_pcm_plug_insert_plugins(pcm, format, slave_format);
if (err < 0) if (err < 0)
return err; return err;
@ -560,10 +559,11 @@ static int snd_pcm_plug_params(snd_pcm_t *pcm, snd_pcm_params_t *params)
err = snd_pcm_params(plug->slave, params); err = snd_pcm_params(plug->slave, params);
if (err < 0) if (err < 0)
snd_pcm_plug_clear(pcm); snd_pcm_plug_clear(pcm);
else {
assert(plug->req_slave->setup.format.sfmt == slave_format->sfmt); assert(slave->setup.format.sfmt == slave_format->sfmt);
assert(plug->req_slave->setup.format.channels == slave_format->channels); assert(slave->setup.format.channels == slave_format->channels);
assert(plug->req_slave->setup.format.rate == slave_format->rate); assert(slave->setup.format.rate == slave_format->rate);
}
return err; return err;
} }