asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-09-19 17:49:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

alsaloop: rework the ctl event handling routine

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2010-10-21 20:38:06 +02:00
parent d53eb0309d
commit 7a11a2b546
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
alsaloop/pcmjob.c
View file

@ -1650,7 +1650,7 @@ static int handle_ctl_events(struct loopback_handle *lhandle,
{
struct loopback *loop = lhandle->loopback;
snd_ctl_event_t *ev;
int err;
int err, restart = 0;
snd_ctl_event_alloca(&ev);
while ((err = snd_ctl_read(lhandle->ctl, ev)) != 0 && err != -EAGAIN) {
@ -1663,42 +1663,45 @@ static int handle_ctl_events(struct loopback_handle *lhandle,
if (verbose > 6)
snd_output_printf(loop->output, "%s: ctl event!!!! %s\n", lhandle->id, snd_ctl_event_elem_get_name(ev));
if (ctl_event_check(lhandle->ctl_active, ev)) {
err = get_active(lhandle);
if (verbose > 7)
snd_output_printf(loop->output, "%s: ctl event active %i\n", lhandle->id, err);
if (!err) {
if (lhandle->loopback->running) {
loop->stop_pending = 1;
loop->stop_count = 0;
}
} else {
loop->stop_pending = 0;
if (loop->running == 0)
goto __restart;
}
continue;
} else if (ctl_event_check(lhandle->ctl_format, ev)) {
err = get_format(lhandle);
if (lhandle->format != err)
goto __restart;
restart = 1;
continue;
} else if (ctl_event_check(lhandle->ctl_rate, ev)) {
err = get_rate(lhandle);
if (lhandle->rate != err)
goto __restart;
restart = 1;
continue;
} else if (ctl_event_check(lhandle->ctl_channels, ev)) {
err = get_channels(lhandle);
if (lhandle->channels != err)
goto __restart;
restart = 1;
continue;
}
__ctl_check:
control_event(lhandle, ev);
}
return 0;
__restart:
pcmjob_stop(loop);
err = pcmjob_start(loop);
if (err < 0)
return err;
err = get_active(lhandle);
if (verbose > 7)
snd_output_printf(loop->output, "%s: ctl event active %i\n", lhandle->id, err);
if (!err) {
if (lhandle->loopback->running) {
loop->stop_pending = 1;
loop->stop_count = 0;
}
} else {
loop->stop_pending = 0;
if (loop->running == 0)
restart = 1;
}
if (restart) {
pcmjob_stop(loop);
err = pcmjob_start(loop);
if (err < 0)
return err;
}
return 1;
}