summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/protocol-esound.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/protocol-esound.c
parente68e4a57bfc5211309db9bec8057a8b038a0bb14 (diff)
make proplist inheritance scheme automatic and implicit
Diffstat (limited to 'src/pulsecore/protocol-esound.c')
-rw-r--r--src/pulsecore/protocol-esound.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/pulsecore/protocol-esound.c b/src/pulsecore/protocol-esound.c
index 97d10df5..b1d39094 100644
--- a/src/pulsecore/protocol-esound.c
+++ b/src/pulsecore/protocol-esound.c
@@ -422,7 +422,6 @@ static int esd_proto_stream_play(connection *c, esd_proto_t request, const void
sdata.module = c->options->module;
sdata.client = c->client;
sdata.sink = sink;
- pa_proplist_update(sdata.proplist, PA_UPDATE_MERGE, c->client->proplist);
pa_sink_input_new_data_set_sample_spec(&sdata, &ss);
c->sink_input = pa_sink_input_new(c->protocol->core, &sdata, 0);
@@ -525,7 +524,6 @@ static int esd_proto_stream_record(connection *c, esd_proto_t request, const voi
sdata.module = c->options->module;
sdata.client = c->client;
sdata.source = source;
- pa_proplist_update(sdata.proplist, PA_UPDATE_MERGE, c->client->proplist);
pa_source_output_new_data_set_sample_spec(&sdata, &ss);
c->source_output = pa_source_output_new(c->protocol->core, &sdata, 0);