mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-*-restore: use pa_module_hook_connect

Browse source 
Refactoring, no functional change.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2015-03-27 11:20:12 +01:00
parent 127e8a1519
commit 619def0c73
3 changed files with 23 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/modules/module-card-restore.c
View file

@ -60,15 +60,8 @@ static const char* const valid_modargs[] = {
struct userdata {
pa_core *core;
pa_module *module;
pa_hook_slot *card_new_hook_slot;
pa_hook_slot *card_put_hook_slot;
pa_hook_slot *card_profile_changed_hook_slot;
pa_hook_slot *card_profile_added_hook_slot;
pa_hook_slot *profile_available_changed_hook_slot;
pa_hook_slot *port_offset_hook_slot;
pa_time_event *save_time_event;
pa_database *database;
bool hooks_connected;
};
#define ENTRY_VERSION 2
@ -536,14 +529,13 @@ int pa__init(pa_module*m) {
u->core = m->core;
u->module = m;
u->card_new_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_NEW], PA_HOOK_EARLY, (pa_hook_cb_t) card_new_hook_callback, u);
u->card_put_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_PUT], PA_HOOK_NORMAL, (pa_hook_cb_t) card_put_hook_callback, u);
u->card_profile_changed_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) card_profile_changed_callback, u);
u->card_profile_added_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_ADDED], PA_HOOK_NORMAL, (pa_hook_cb_t) card_profile_added_callback, u);
u->profile_available_changed_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_AVAILABLE_CHANGED],
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_CARD_NEW], PA_HOOK_EARLY, (pa_hook_cb_t) card_new_hook_callback, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_CARD_PUT], PA_HOOK_NORMAL, (pa_hook_cb_t) card_put_hook_callback, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) card_profile_changed_callback, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_ADDED], PA_HOOK_NORMAL, (pa_hook_cb_t) card_profile_added_callback, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_AVAILABLE_CHANGED],
PA_HOOK_NORMAL, profile_available_changed_callback, u);
u->port_offset_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_PORT_LATENCY_OFFSET_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) port_offset_change_callback, u);
u->hooks_connected = true;
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_PORT_LATENCY_OFFSET_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) port_offset_change_callback, u);
if (!(fname = pa_state_path("card-database", true)))
goto fail;
@ -577,15 +569,6 @@ void pa__done(pa_module*m) {
if (!(u = m->userdata))
return;
if (u->hooks_connected) {
pa_hook_slot_free(u->card_new_hook_slot);
pa_hook_slot_free(u->card_put_hook_slot);
pa_hook_slot_free(u->card_profile_changed_hook_slot);
pa_hook_slot_free(u->card_profile_added_hook_slot);
pa_hook_slot_free(u->profile_available_changed_hook_slot);
pa_hook_slot_free(u->port_offset_hook_slot);
}
if (u->save_time_event)
u->core->mainloop->time_free(u->save_time_event);