diff options
| author | Colin Guthrie <pulse@colin.guthr.ie> | 2008-07-21 16:04:06 +0100 |
|---|---|---|
| committer | Colin Guthrie <pulse@colin.guthr.ie> | 2008-07-21 16:04:06 +0100 |
| commit | 0e1936fd56ad51509424f3eca06fe3a442b4dc9c (patch) | |
| tree | 810672093de32914dc4082d7f3dc859f5caf5044 /src | |
| parent | 0786de2ba5b75c557426cf05075823d8f4e3662b (diff) | |
| parent | 46a35c681f87b540c53d1af380ccfc65b041707f (diff) | |
Merge branch 'master' of git://git.0pointer.de/pulseaudio
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/alsa-util.c | 3 | ||||
| -rw-r--r-- | src/modules/module-tunnel.c | 2 |
2 files changed, 3 insertions, 2 deletions
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; 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; |