diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-06-11 19:45:57 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-06-11 19:45:57 +0000 |
| commit | 92e4fb318e5f1e483911ed44743115bae1d0fd54 (patch) | |
| tree | 1db9f7dbb0576e7801202f1e66db15ff1c607b1b /src/modules/module-combine.c | |
| parent | 1337afdee49e69f77f342ba694f53cccc5446453 (diff) | |
merge Colin Guthrie's module-always-sink module, and add priorization to the hook subsystem while doing so.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2516 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/module-combine.c')
| -rw-r--r-- | src/modules/module-combine.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c index fc8be18d..eab86531 100644 --- a/src/modules/module-combine.c +++ b/src/modules/module-combine.c @@ -1088,11 +1088,11 @@ int pa__init(pa_module*m) { } } - u->sink_new_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], (pa_hook_cb_t) sink_new_hook_cb, u); + u->sink_new_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_LATE, (pa_hook_cb_t) sink_new_hook_cb, u); } - u->sink_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], (pa_hook_cb_t) sink_unlink_hook_cb, u); - u->sink_state_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_STATE_CHANGED], (pa_hook_cb_t) sink_state_changed_hook_cb, u); + u->sink_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_EARLY, (pa_hook_cb_t) sink_unlink_hook_cb, u); + u->sink_state_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_STATE_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) sink_state_changed_hook_cb, u); pick_master(u, NULL); |