summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/sink-input.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-input.c
parente68e4a57bfc5211309db9bec8057a8b038a0bb14 (diff)
make proplist inheritance scheme automatic and implicit
Diffstat (limited to 'src/pulsecore/sink-input.c')
-rw-r--r--src/pulsecore/sink-input.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index 8cdc9286..8f182667 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -190,6 +190,9 @@ pa_sink_input* pa_sink_input_new(
pa_return_null_if_fail(data->resample_method < PA_RESAMPLER_MAX);
+ if (data->client)
+ pa_proplist_update(data->proplist, PA_UPDATE_MERGE, data->client->proplist);
+
if (pa_hook_fire(&core->hooks[PA_CORE_HOOK_SINK_INPUT_FIXATE], data) < 0)
return NULL;