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

namereg: Don't set default sink/source on get()

Browse source 
This removes the nasty side-effect that a call to
pa_namereg_get_default_{source,sink}() will also *set* the default
source/sink.

This is a more complete fix for commit 766dbc68 ("conf: Make sure
module-dbus-protocol is loaded after module-default-device-restore")

https://bugs.freedesktop.org/show_bug.cgi?id=40897
This commit is contained in:
Arun Raghavan 2011-09-28 14:28:32 +05:30
parent f1e41a78cc
commit 5c28acb1db
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pulsecore/namereg.c
View file

@ -293,10 +293,7 @@ pa_sink *pa_namereg_get_default_sink(pa_core *c) {
if (!best || s->priority > best->priority) if (!best || s->priority > best->priority)
best = s; best = s;
if (best) return best;
return pa_namereg_set_default_sink(c, best);
return NULL;
} }
pa_source *pa_namereg_get_default_source(pa_core *c) { pa_source *pa_namereg_get_default_source(pa_core *c) {
@ -316,7 +313,7 @@ pa_source *pa_namereg_get_default_source(pa_core *c) {
best = s; best = s;
if (best) if (best)
return pa_namereg_set_default_source(c, best); return best;
/* Then, fallback to a monitor */ /* Then, fallback to a monitor */
PA_IDXSET_FOREACH(s, c->sources, idx) PA_IDXSET_FOREACH(s, c->sources, idx)
@ -329,8 +326,5 @@ pa_source *pa_namereg_get_default_source(pa_core *c) {
s->monitor_of->priority > best->monitor_of->priority)) s->monitor_of->priority > best->monitor_of->priority))
best = s; best = s;
if (best) return best;
return pa_namereg_set_default_source(c, best);
return NULL;
} }