From ff3f43525d0b528d43a0480d596973d07c920580 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 16 Jul 2008 11:12:07 +0200 Subject: try to bypass alsa softvol, since it is broken when used with snd_pcm_rewind() --- src/modules/alsa-util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/modules/alsa-util.c b/src/modules/alsa-util.c index 5d52cbc9..8abf834d 100644 --- a/src/modules/alsa-util.c +++ b/src/modules/alsa-util.c @@ -574,7 +574,8 @@ snd_pcm_t *pa_alsa_open_by_device_id( SND_PCM_NONBLOCK| SND_PCM_NO_AUTO_RESAMPLE| SND_PCM_NO_AUTO_CHANNELS| - SND_PCM_NO_AUTO_FORMAT)) < 0) { + SND_PCM_NO_AUTO_FORMAT | + SND_PCM_NO_SOFTVOL)) < 0) { pa_log_info("Couldn't open PCM device %s: %s", d, snd_strerror(err)); pa_xfree(d); continue; -- cgit From 46a35c681f87b540c53d1af380ccfc65b041707f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 16 Jul 2008 11:28:46 +0200 Subject: forward process_msg calls to the generic source handler, not the generic sink handler --- src/modules/module-tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c index 1890646f..21f2f842 100644 --- a/src/modules/module-tunnel.c +++ b/src/modules/module-tunnel.c @@ -514,7 +514,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off case PA_SINK_MESSAGE_SET_STATE: { int r; - if ((r = pa_sink_process_msg(o, code, data, offset, chunk)) >= 0) + if ((r = pa_source_process_msg(o, code, data, offset, chunk)) >= 0) stream_cork_within_thread(u, u->source->state == PA_SOURCE_SUSPENDED); return r; -- cgit