diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-01-15 20:27:07 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-01-15 20:27:07 +0100 |
| commit | 47a2b17d01cc0dceb964df07d17e406726d50d45 (patch) | |
| tree | 07237669ac40420601e870a74151ffce587ec396 /src/pulsecore/protocol-native.c | |
| parent | e68e4a57bfc5211309db9bec8057a8b038a0bb14 (diff) | |
make proplist inheritance scheme automatic and implicit
Diffstat (limited to 'src/pulsecore/protocol-native.c')
| -rw-r--r-- | src/pulsecore/protocol-native.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 21797527..0a070f47 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -601,7 +601,6 @@ static record_stream* record_stream_new( pa_source_output_new_data_init(&data); pa_proplist_update(data.proplist, PA_UPDATE_REPLACE, p); - pa_proplist_update(data.proplist, PA_UPDATE_MERGE, c->client->proplist); data.driver = __FILE__; data.module = c->options->module; data.client = c->client; @@ -1001,7 +1000,6 @@ static playback_stream* playback_stream_new( pa_sink_input_new_data_init(&data); pa_proplist_update(data.proplist, PA_UPDATE_REPLACE, p); - pa_proplist_update(data.proplist, PA_UPDATE_MERGE, c->client->proplist); data.driver = __FILE__; data.module = c->options->module; data.client = c->client; |