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

Fixed problem with the route plugin and ttable (an extra route plugin was

Browse source 
inserted accidently).
This commit is contained in:
Jaroslav Kysela 2004-08-11 15:09:05 +00:00
parent 6170a88309
commit 06976cbcce
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pcm/pcm_plug.c
View file

@ -53,7 +53,7 @@ typedef struct {
int srate; int srate;
enum snd_pcm_plug_route_policy route_policy; enum snd_pcm_plug_route_policy route_policy;
snd_pcm_route_ttable_entry_t *ttable; snd_pcm_route_ttable_entry_t *ttable;
int ttable_ok; int ttable_ok, ttable_last;
unsigned int tt_ssize, tt_cused, tt_sused; unsigned int tt_ssize, tt_cused, tt_sused;
} snd_pcm_plug_t; } snd_pcm_plug_t;
@ -361,7 +361,8 @@ static int snd_pcm_plug_change_channels(snd_pcm_t *pcm, snd_pcm_t **new, snd_pcm
snd_pcm_route_ttable_entry_t *ttable; snd_pcm_route_ttable_entry_t *ttable;
int err; int err;
assert(snd_pcm_format_linear(slv->format)); assert(snd_pcm_format_linear(slv->format));
if (clt->channels == slv->channels && !plug->ttable) if (clt->channels == slv->channels &&
(!plug->ttable || !plug->ttable_last))
return 0; return 0;
if (clt->rate != slv->rate && if (clt->rate != slv->rate &&
clt->channels > slv->channels) clt->channels > slv->channels)
@ -560,7 +561,7 @@ static int snd_pcm_plug_insert_plugins(snd_pcm_t *pcm,
}; };
snd_pcm_plug_params_t p = *slave; snd_pcm_plug_params_t p = *slave;
unsigned int k = 0; unsigned int k = 0;
plug->ttable_ok = 0; plug->ttable_ok = plug->ttable_last = 0;
while (client->format != p.format || while (client->format != p.format ||
client->channels != p.channels || client->channels != p.channels ||
client->rate != p.rate || client->rate != p.rate ||
@ -584,6 +585,7 @@ static int snd_pcm_plug_insert_plugins(snd_pcm_t *pcm,
if (plug->ttable && !plug->ttable_ok) { if (plug->ttable && !plug->ttable_ok) {
snd_pcm_t *new; snd_pcm_t *new;
int err; int err;
plug->ttable_last = 1;
err = snd_pcm_plug_change_channels(pcm, &new, client, &p); err = snd_pcm_plug_change_channels(pcm, &new, client, &p);
if (err < 0) { if (err < 0) {
snd_pcm_plug_clear(pcm); snd_pcm_plug_clear(pcm);