PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Automatically restore profile of cards");
PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(TRUE);
+PA_MODULE_LOAD_ONCE(true);
#define SAVE_INTERVAL (10 * PA_USEC_PER_SEC)
pa_module *module;
pa_hook_slot *card_new_hook_slot;
pa_hook_slot *card_put_hook_slot;
- pa_hook_slot *card_profile_hook_slot;
+ pa_hook_slot *card_profile_changed_hook_slot;
+ pa_hook_slot *card_profile_added_hook_slot;
pa_hook_slot *port_offset_hook_slot;
pa_time_event *save_time_event;
pa_database *database;
u->save_time_event = pa_core_rttime_new(u->core, pa_rtclock_now() + SAVE_INTERVAL, save_time_callback, u);
}
+static void port_info_free(struct port_info *p_info) {
+ pa_assert(p_info);
+
+ pa_xfree(p_info->name);
+ pa_xfree(p_info);
+}
+
static struct entry* entry_new(void) {
struct entry *r = pa_xnew0(struct entry, 1);
r->version = ENTRY_VERSION;
- r->ports = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
+ r->ports = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, (pa_free_cb_t) port_info_free);
return r;
}
return p_info;
}
-static void port_info_free(struct port_info *p_info) {
- pa_assert(p_info);
-
- pa_xfree(p_info->name);
- pa_xfree(p_info);
-}
-
static void entry_free(struct entry* e) {
pa_assert(e);
pa_xfree(e->profile);
- pa_hashmap_free(e->ports, (pa_free_cb_t) port_info_free);
+ pa_hashmap_free(e->ports);
pa_xfree(e);
}
return true;
}
-static pa_bool_t entry_write(struct userdata *u, const char *name, const struct entry *e) {
+static bool entry_write(struct userdata *u, const char *name, const struct entry *e) {
pa_tagstruct *t;
pa_datum key, data;
- pa_bool_t r;
+ bool r;
void *state;
struct port_info *p_info;
data.data = (void*)pa_tagstruct_data(t, &data.size);
- r = (pa_database_set(u->database, &key, &data, TRUE) == 0);
+ r = (pa_database_set(u->database, &key, &data, true) == 0);
pa_tagstruct_free(t);
return PA_HOOK_OK;
}
-static pa_hook_result_t card_profile_change_callback(pa_core *c, pa_card *card, struct userdata *u) {
+static pa_hook_result_t card_profile_changed_callback(pa_core *c, pa_card *card, struct userdata *u) {
struct entry *entry;
pa_assert(card);
return PA_HOOK_OK;
}
+static pa_hook_result_t card_profile_added_callback(pa_core *c, pa_card_profile *profile, struct userdata *u) {
+ struct entry *entry;
+
+ pa_assert(profile);
+
+ if (!(entry = entry_read(u, profile->card->name)))
+ return PA_HOOK_OK;
+
+ if (pa_safe_streq(entry->profile, profile->name)) {
+ if (pa_card_set_profile(profile->card, profile, true) >= 0)
+ pa_log_info("Restored profile '%s' for card %s.", profile->name, profile->card->name);
+ }
+
+ entry_free(entry);
+
+ return PA_HOOK_OK;
+}
+
static pa_hook_result_t port_offset_change_callback(pa_core *c, pa_device_port *port, struct userdata *u) {
struct entry *entry;
pa_card *card;
if (!new_data->active_profile) {
pa_card_new_data_set_profile(new_data, e->profile);
pa_log_info("Restored profile '%s' for card %s.", new_data->active_profile, new_data->name);
- new_data->save_profile = TRUE;
+ new_data->save_profile = true;
} else
pa_log_debug("Not restoring profile for card %s, because already set.", new_data->name);
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_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) card_profile_change_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->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;
- if (!(fname = pa_state_path("card-database", TRUE)))
+ if (!(fname = pa_state_path("card-database", true)))
goto fail;
- if (!(u->database = pa_database_open(fname, TRUE))) {
+ if (!(u->database = pa_database_open(fname, true))) {
pa_log("Failed to open volume database '%s': %s", fname, pa_cstrerror(errno));
pa_xfree(fname);
goto fail;
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_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->port_offset_hook_slot);
}