Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio

This commit is contained in:
Lennart Poettering 2009-01-08 21:18:15 +01:00
commit c2002dcd1f
31 changed files with 13676 additions and 1766 deletions

View file

@ -1409,7 +1409,7 @@ int pa__init(pa_module*m) {
}
if (found)
if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Master", "PCM")))
if (!(u->mixer_elem = pa_alsa_find_elem(u->mixer_handle, "Master", "PCM", TRUE)))
found = FALSE;
if (!found) {