diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-02-04 18:28:52 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-02-04 18:28:52 +0100 |
commit | 4cf82c74a1401dc5fa678b1367daa71242536d4b (patch) | |
tree | 6438f8f2130df278857d6bdb71c04f65af5de325 /src/pulsecore/source-output.c | |
parent | f6ec971e887e68ba74fb7132dcedddc9b6f2b2db (diff) |
merge in properties earlier to make identification of streams from hooks easier
Diffstat (limited to 'src/pulsecore/source-output.c')
-rw-r--r-- | src/pulsecore/source-output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c index c5cb16d8..63d56d5a 100644 --- a/src/pulsecore/source-output.c +++ b/src/pulsecore/source-output.c @@ -110,6 +110,9 @@ int pa_source_output_new( pa_assert(core); pa_assert(data); + if (data->client) + pa_proplist_update(data->proplist, PA_UPDATE_MERGE, data->client->proplist); + if ((r = pa_hook_fire(&core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_NEW], data)) < 0) return r; @@ -159,9 +162,6 @@ int pa_source_output_new( pa_return_val_if_fail(data->resample_method < PA_RESAMPLER_MAX, -PA_ERR_INVALID); - if (data->client) - pa_proplist_update(data->proplist, PA_UPDATE_MERGE, data->client->proplist); - if ((r = pa_hook_fire(&core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_FIXATE], data)) < 0) return r; |