mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.0pointer.de/pulseaudio

Browse source
This commit is contained in:
Colin Guthrie 2008-07-21 16:04:06 +01:00
commit 0e1936fd56
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/alsa-util.c
View file

@ -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;

2
src/modules/module-tunnel.c
View file

@ -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;