merge in properties earlier to make identification of streams from hooks easier

This commit is contained in:
Lennart Poettering 2009-02-04 18:28:52 +01:00
parent f6ec971e88
commit 4cf82c74a1
2 changed files with 6 additions and 6 deletions

View file

@ -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;