summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/sink.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-01-15 20:27:07 +0100
committerLennart Poettering <lennart@poettering.net>2009-01-15 20:27:07 +0100
commit47a2b17d01cc0dceb964df07d17e406726d50d45 (patch)
tree07237669ac40420601e870a74151ffce587ec396 /src/pulsecore/sink.c
parente68e4a57bfc5211309db9bec8057a8b038a0bb14 (diff)
make proplist inheritance scheme automatic and implicit
Diffstat (limited to 'src/pulsecore/sink.c')
-rw-r--r--src/pulsecore/sink.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index d1d68cdd..2abc848a 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -167,6 +167,9 @@ pa_sink* pa_sink_new(
if (!data->muted_is_set)
data->muted = FALSE;
+ if (data->card)
+ pa_proplist_update(data->proplist, PA_UPDATE_MERGE, data->card->proplist);
+
if (pa_hook_fire(&core->hooks[PA_CORE_HOOK_SINK_FIXATE], data) < 0) {
pa_xfree(s);
pa_namereg_unregister(core, name);