summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/protocol-native.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-08-04 23:32:52 +0200
committerLennart Poettering <lennart@poettering.net>2008-08-04 23:32:52 +0200
commit64a23677d36bc0e3069b761c2a8602039d175c5c (patch)
treeff95e9b17c4f7f402af02933fc65f06b90a0bef1 /src/pulsecore/protocol-native.c
parent03cd37eb78f470f4b483e14affb633fcd00efd04 (diff)
inherit proplist on sample playback from client
Diffstat (limited to 'src/pulsecore/protocol-native.c')
-rw-r--r--src/pulsecore/protocol-native.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 0eac3c26..3c3c1e5f 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -2432,6 +2432,8 @@ static void command_play_sample(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED ui
return;
}
+ pa_proplist_update(p, PA_UPDATE_MERGE, c->client->proplist);
+
if (pa_scache_play_item(c->protocol->core, name, sink, volume, p, &idx) < 0) {
pa_pstream_send_error(c->pstream, tag, PA_ERR_NOENTITY);
pa_proplist_free(p);