PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Automatically restore the volume/mute state of devices");
PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(TRUE);
+PA_MODULE_LOAD_ONCE(true);
PA_MODULE_USAGE(
"restore_port=<Save/restore port?> "
"restore_volume=<Save/restore volumes?> "
pa_hook_slot
*sink_new_hook_slot,
*sink_fixate_hook_slot,
+ *sink_port_hook_slot,
*sink_put_hook_slot,
*source_new_hook_slot,
*source_fixate_hook_slot,
+ *source_port_hook_slot,
*connection_unlink_hook_slot;
pa_time_event *save_time_event;
pa_database *database;
pa_native_protocol *protocol;
pa_idxset *subscribed;
- pa_bool_t restore_volume:1;
- pa_bool_t restore_muted:1;
- pa_bool_t restore_port:1;
- pa_bool_t restore_formats:1;
+ bool restore_volume:1;
+ bool restore_muted:1;
+ bool restore_port:1;
+ bool restore_formats:1;
};
-/* Protocol extention commands */
+/* Protocol extension commands */
enum {
SUBCOMMAND_TEST,
SUBCOMMAND_SUBSCRIBE,
SUBCOMMAND_SAVE_FORMATS
};
-
#define ENTRY_VERSION 1
struct entry {
uint8_t version;
- pa_bool_t muted_valid, volume_valid, port_valid;
- pa_bool_t muted;
+ bool port_valid;
+ char *port;
+};
+
+#define PERPORTENTRY_VERSION 1
+
+struct perportentry {
+ uint8_t version;
+ bool muted_valid, volume_valid;
+ bool muted;
pa_channel_map channel_map;
pa_cvolume volume;
- char *port;
pa_idxset *formats;
};
uint32_t idx;
if (sink_idx != PA_INVALID_INDEX) {
- for (c = pa_idxset_first(u->subscribed, &idx); c; c = pa_idxset_next(u->subscribed, &idx)) {
+ PA_IDXSET_FOREACH(c, u->subscribed, idx) {
pa_tagstruct *t;
t = pa_tagstruct_new(NULL, 0);
u->save_time_event = pa_core_rttime_new(u->core, pa_rtclock_now() + SAVE_INTERVAL, save_time_callback, u);
}
-static struct entry* entry_new(pa_bool_t add_pcm_format) {
+#ifdef ENABLE_LEGACY_DATABASE_ENTRY_FORMAT
+/* Some forward declarations */
+static bool legacy_entry_read(struct userdata *u, pa_datum *data, struct entry **entry, struct perportentry **perportentry);
+static struct perportentry* perportentry_read(struct userdata *u, const char *basekeyname, const char *port);
+static bool perportentry_write(struct userdata *u, const char *basekeyname, const char *port, const struct perportentry *e);
+static void perportentry_free(struct perportentry* e);
+#endif
+
+static struct entry* entry_new(void) {
struct entry *r = pa_xnew0(struct entry, 1);
r->version = ENTRY_VERSION;
+ return r;
+}
+
+static void entry_free(struct entry* e) {
+ pa_assert(e);
+
+ pa_xfree(e->port);
+ pa_xfree(e);
+}
+
+static bool entry_write(struct userdata *u, const char *name, const struct entry *e) {
+ pa_tagstruct *t;
+ pa_datum key, data;
+ bool r;
+
+ pa_assert(u);
+ pa_assert(name);
+ pa_assert(e);
+
+ t = pa_tagstruct_new(NULL, 0);
+ pa_tagstruct_putu8(t, e->version);
+ pa_tagstruct_put_boolean(t, e->port_valid);
+ pa_tagstruct_puts(t, e->port);
+
+ key.data = (char *) name;
+ key.size = strlen(name);
+
+ data.data = (void*)pa_tagstruct_data(t, &data.size);
+
+ r = (pa_database_set(u->database, &key, &data, true) == 0);
+
+ pa_tagstruct_free(t);
+
+ return r;
+}
+
+static struct entry* entry_read(struct userdata *u, const char *name) {
+ pa_datum key, data;
+ struct entry *e = NULL;
+ pa_tagstruct *t = NULL;
+ const char* port;
+
+ pa_assert(u);
+ pa_assert(name);
+
+ key.data = (char*) name;
+ key.size = strlen(name);
+
+ pa_zero(data);
+
+ if (!pa_database_get(u->database, &key, &data))
+ goto fail;
+
+ t = pa_tagstruct_new(data.data, data.size);
+ e = entry_new();
+
+ if (pa_tagstruct_getu8(t, &e->version) < 0 ||
+ e->version > ENTRY_VERSION ||
+ pa_tagstruct_get_boolean(t, &e->port_valid) < 0 ||
+ pa_tagstruct_gets(t, &port) < 0) {
+
+ goto fail;
+ }
+
+ if (!pa_tagstruct_eof(t))
+ goto fail;
+
+ e->port = pa_xstrdup(port);
+
+ pa_tagstruct_free(t);
+ pa_datum_free(&data);
+
+ return e;
+
+fail:
+
+ pa_log_debug("Database contains invalid data for key: %s (probably pre-v1.0 data)", name);
+
+ if (e)
+ entry_free(e);
+ if (t)
+ pa_tagstruct_free(t);
+
+#ifdef ENABLE_LEGACY_DATABASE_ENTRY_FORMAT
+{
+ struct perportentry *ppe;
+ pa_log_debug("Attempting to load legacy (pre-v1.0) data for key: %s", name);
+ if (legacy_entry_read(u, &data, &e, &ppe)) {
+ bool written = false;
+
+ pa_log_debug("Success. Saving new format for key: %s", name);
+ written = entry_write(u, name, e);
+
+ /* Now convert the legacy entry into per-port entries */
+ if (0 == strncmp("sink:", name, 5)) {
+ pa_sink *sink;
+
+ if ((sink = pa_namereg_get(u->core, name+5, PA_NAMEREG_SINK))) {
+ /* Write a "null" port entry. The read code will automatically try this
+ * if it cannot find a specific port-named entry. */
+ written = perportentry_write(u, name, NULL, ppe) || written;
+ }
+ } else if (0 == strncmp("source:", name, 7)) {
+ pa_source *source;
+
+ if ((source = pa_namereg_get(u->core, name+7, PA_NAMEREG_SOURCE))) {
+ /* Write a "null" port entry. The read code will automatically try this
+ * if it cannot find a specific port-named entry. */
+ written = perportentry_write(u, name, NULL, ppe) || written;
+ }
+ }
+ perportentry_free(ppe);
+
+ if (written)
+ /* NB The device type doesn't matter when we pass in an invalid index. */
+ trigger_save(u, PA_DEVICE_TYPE_SINK, PA_INVALID_INDEX);
+
+ pa_datum_free(&data);
+ return e;
+ }
+ pa_log_debug("Unable to load legacy (pre-v1.0) data for key: %s. Ignoring.", name);
+}
+#endif
+
+ pa_datum_free(&data);
+ return NULL;
+}
+
+static struct entry* entry_copy(const struct entry *e) {
+ struct entry* r;
+
+ pa_assert(e);
+ r = entry_new();
+ r->version = e->version;
+ r->port_valid = e->port_valid;
+ r->port = pa_xstrdup(e->port);
+
+ return r;
+}
+
+static bool entries_equal(const struct entry *a, const struct entry *b) {
+
+ pa_assert(a && b);
+
+ if (a->port_valid != b->port_valid ||
+ (a->port_valid && !pa_streq(a->port, b->port)))
+ return false;
+
+ return true;
+}
+
+static struct perportentry* perportentry_new(bool add_pcm_format) {
+ struct perportentry *r = pa_xnew0(struct perportentry, 1);
+ r->version = PERPORTENTRY_VERSION;
r->formats = pa_idxset_new(NULL, NULL);
if (add_pcm_format) {
pa_format_info *f = pa_format_info_new();
return r;
}
-static void entry_free(struct entry* e) {
+static void perportentry_free(struct perportentry* e) {
pa_assert(e);
- pa_idxset_free(e->formats, (pa_free2_cb_t) pa_format_info_free2, NULL);
- pa_xfree(e->port);
+ pa_idxset_free(e->formats, (pa_free_cb_t) pa_format_info_free);
pa_xfree(e);
}
-static pa_bool_t entry_write(struct userdata *u, const char *name, const struct entry *e) {
+static bool perportentry_write(struct userdata *u, const char *basekeyname, const char *port, const struct perportentry *e) {
pa_tagstruct *t;
pa_datum key, data;
- pa_bool_t r;
+ bool r;
uint32_t i;
pa_format_info *f;
uint8_t n_formats;
+ char *name;
pa_assert(u);
- pa_assert(name);
+ pa_assert(basekeyname);
pa_assert(e);
+ name = pa_sprintf_malloc("%s:%s", basekeyname, (port ? port : "null"));
+
n_formats = pa_idxset_size(e->formats);
pa_assert(n_formats > 0);
pa_tagstruct_put_cvolume(t, &e->volume);
pa_tagstruct_put_boolean(t, e->muted_valid);
pa_tagstruct_put_boolean(t, e->muted);
- pa_tagstruct_put_boolean(t, e->port_valid);
- pa_tagstruct_puts(t, e->port);
pa_tagstruct_putu8(t, n_formats);
PA_IDXSET_FOREACH(f, e->formats, i) {
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);
+ pa_xfree(name);
return r;
}
-#ifdef ENABLE_LEGACY_DATABASE_ENTRY_FORMAT
-
-#define LEGACY_ENTRY_VERSION 2
-static struct entry* legacy_entry_read(struct userdata *u, pa_datum *data) {
- struct legacy_entry {
- uint8_t version;
- pa_bool_t muted_valid:1, volume_valid:1, port_valid:1;
- pa_bool_t muted:1;
- pa_channel_map channel_map;
- pa_cvolume volume;
- char port[PA_NAME_MAX];
- } PA_GCC_PACKED;
- struct legacy_entry *le;
- struct entry *e;
-
- pa_assert(u);
- pa_assert(data);
-
- if (data->size != sizeof(struct legacy_entry)) {
- pa_log_debug("Size does not match.");
- return NULL;
- }
-
- le = (struct legacy_entry*)data->data;
-
- if (le->version != LEGACY_ENTRY_VERSION) {
- pa_log_debug("Version mismatch.");
- return NULL;
- }
-
- if (!memchr(le->port, 0, sizeof(le->port))) {
- pa_log_warn("Port has missing NUL byte.");
- return NULL;
- }
-
- if (le->volume_valid && !pa_channel_map_valid(&le->channel_map)) {
- pa_log_warn("Invalid channel map.");
- return NULL;
- }
-
- if (le->volume_valid && (!pa_cvolume_valid(&le->volume) || !pa_cvolume_compatible_with_channel_map(&le->volume, &le->channel_map))) {
- pa_log_warn("Volume and channel map don't match.");
- return NULL;
- }
-
- e = entry_new(TRUE);
- e->muted_valid = le->muted_valid;
- e->volume_valid = le->volume_valid;
- e->port_valid = le->port_valid;
- e->muted = le->muted;
- e->channel_map = le->channel_map;
- e->volume = le->volume;
- e->port = pa_xstrdup(le->port);
- return e;
-}
-#endif
-
-static struct entry* entry_read(struct userdata *u, const char *name) {
+static struct perportentry* perportentry_read(struct userdata *u, const char *basekeyname, const char *port) {
pa_datum key, data;
- struct entry *e = NULL;
+ struct perportentry *e = NULL;
pa_tagstruct *t = NULL;
- const char* port;
uint8_t i, n_formats;
+ char *name;
pa_assert(u);
- pa_assert(name);
+ pa_assert(basekeyname);
- key.data = (char*) name;
+ name = pa_sprintf_malloc("%s:%s", basekeyname, (port ? port : "null"));
+
+ key.data = name;
key.size = strlen(name);
pa_zero(data);
goto fail;
t = pa_tagstruct_new(data.data, data.size);
- e = entry_new(FALSE);
+ e = perportentry_new(false);
if (pa_tagstruct_getu8(t, &e->version) < 0 ||
- e->version > ENTRY_VERSION ||
+ e->version > PERPORTENTRY_VERSION ||
pa_tagstruct_get_boolean(t, &e->volume_valid) < 0 ||
pa_tagstruct_get_channel_map(t, &e->channel_map) < 0 ||
pa_tagstruct_get_cvolume(t, &e->volume) < 0 ||
pa_tagstruct_get_boolean(t, &e->muted_valid) < 0 ||
pa_tagstruct_get_boolean(t, &e->muted) < 0 ||
- pa_tagstruct_get_boolean(t, &e->port_valid) < 0 ||
- pa_tagstruct_gets(t, &port) < 0 ||
pa_tagstruct_getu8(t, &n_formats) < 0 || n_formats < 1) {
goto fail;
}
- e->port = pa_xstrdup(port);
-
for (i = 0; i < n_formats; ++i) {
pa_format_info *f = pa_format_info_new();
if (pa_tagstruct_get_format_info(t, f) < 0) {
pa_tagstruct_free(t);
pa_datum_free(&data);
+ pa_xfree(name);
return e;
fail:
- pa_log_debug("Database contains invalid data for key: %s (probably pre-v1.0 data)", name);
-
if (e)
- entry_free(e);
+ perportentry_free(e);
if (t)
pa_tagstruct_free(t);
+ pa_datum_free(&data);
+
#ifdef ENABLE_LEGACY_DATABASE_ENTRY_FORMAT
- pa_log_debug("Attempting to load legacy (pre-v1.0) data for key: %s", name);
- if ((e = legacy_entry_read(u, &data))) {
- pa_log_debug("Success. Saving new format for key: %s", name);
- if (entry_write(u, name, e))
- trigger_save(u, PA_DEVICE_TYPE_SINK, PA_INVALID_INDEX);
- pa_datum_free(&data);
- return e;
- } else
- pa_log_debug("Unable to load legacy (pre-v1.0) data for key: %s. Ignoring.", name);
+ /* Try again with a null port. This is used when dealing with migration from older versions */
+ if (port) {
+ pa_xfree(name);
+ return perportentry_read(u, basekeyname, NULL);
+ }
#endif
- pa_datum_free(&data);
+ pa_log_debug("Database contains invalid data for key: %s", name);
+
+ pa_xfree(name);
+
return NULL;
}
-static struct entry* entry_copy(const struct entry *e) {
- struct entry* r;
+static struct perportentry* perportentry_copy(const struct perportentry *e) {
+ struct perportentry* r;
uint32_t idx;
pa_format_info *f;
pa_assert(e);
- r = entry_new(FALSE);
+ r = perportentry_new(false);
r->version = e->version;
r->muted_valid = e->muted_valid;
r->volume_valid = e->volume_valid;
- r->port_valid = e->port_valid;
r->muted = e->muted;
r->channel_map = e->channel_map;
r->volume = e->volume;
- r->port = pa_xstrdup(e->port);
PA_IDXSET_FOREACH(f, e->formats, idx) {
pa_idxset_put(r->formats, pa_format_info_copy(f), NULL);
return r;
}
-static pa_bool_t entries_equal(const struct entry *a, const struct entry *b) {
+static bool perportentries_equal(const struct perportentry *a, const struct perportentry *b) {
pa_cvolume t;
- if (a->port_valid != b->port_valid ||
- (a->port_valid && !pa_streq(a->port, b->port)))
- return FALSE;
+ pa_assert(a && b);
if (a->muted_valid != b->muted_valid ||
(a->muted_valid && (a->muted != b->muted)))
- return FALSE;
+ return false;
t = b->volume;
if (a->volume_valid != b->volume_valid ||
(a->volume_valid && !pa_cvolume_equal(pa_cvolume_remap(&t, &b->channel_map, &a->channel_map), &a->volume)))
- return FALSE;
+ return false;
if (pa_idxset_size(a->formats) != pa_idxset_size(b->formats))
- return FALSE;
+ return false;
/** TODO: Compare a bit better */
- return TRUE;
+ return true;
+}
+
+#ifdef ENABLE_LEGACY_DATABASE_ENTRY_FORMAT
+
+#define LEGACY_ENTRY_VERSION 2
+static bool legacy_entry_read(struct userdata *u, pa_datum *data, struct entry **entry, struct perportentry **perportentry) {
+ struct legacy_entry {
+ uint8_t version;
+ bool muted_valid:1, volume_valid:1, port_valid:1;
+ bool muted:1;
+ pa_channel_map channel_map;
+ pa_cvolume volume;
+ char port[PA_NAME_MAX];
+ } PA_GCC_PACKED;
+ struct legacy_entry *le;
+
+ pa_assert(u);
+ pa_assert(data);
+ pa_assert(entry);
+ pa_assert(perportentry);
+
+ if (data->size != sizeof(struct legacy_entry)) {
+ pa_log_debug("Size does not match.");
+ return false;
+ }
+
+ le = (struct legacy_entry*)data->data;
+
+ if (le->version != LEGACY_ENTRY_VERSION) {
+ pa_log_debug("Version mismatch.");
+ return false;
+ }
+
+ if (!memchr(le->port, 0, sizeof(le->port))) {
+ pa_log_warn("Port has missing NUL byte.");
+ return false;
+ }
+
+ if (le->volume_valid && !pa_channel_map_valid(&le->channel_map)) {
+ pa_log_warn("Invalid channel map.");
+ return false;
+ }
+
+ if (le->volume_valid && (!pa_cvolume_valid(&le->volume) || !pa_cvolume_compatible_with_channel_map(&le->volume, &le->channel_map))) {
+ pa_log_warn("Volume and channel map don't match.");
+ return false;
+ }
+
+ *entry = entry_new();
+ (*entry)->port_valid = le->port_valid;
+ (*entry)->port = pa_xstrdup(le->port);
+
+ *perportentry = perportentry_new(true);
+ (*perportentry)->muted_valid = le->muted_valid;
+ (*perportentry)->volume_valid = le->volume_valid;
+ (*perportentry)->muted = le->muted;
+ (*perportentry)->channel_map = le->channel_map;
+ (*perportentry)->volume = le->volume;
+
+ return true;
}
+#endif
static void subscribe_callback(pa_core *c, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
struct userdata *u = userdata;
- struct entry *entry, *old;
+ struct entry *e, *olde;
+ struct perportentry *ppe, *oldppe;
char *name;
+ const char *port = NULL;
pa_device_type_t type;
+ bool written = false;
pa_assert(c);
pa_assert(u);
type = PA_DEVICE_TYPE_SINK;
name = pa_sprintf_malloc("sink:%s", sink->name);
+ if (sink->active_port)
+ port = sink->active_port->name;
- if ((old = entry_read(u, name)))
- entry = entry_copy(old);
+ if ((olde = entry_read(u, name)))
+ e = entry_copy(olde);
else
- entry = entry_new(TRUE);
+ e = entry_new();
- if (sink->save_volume) {
- entry->channel_map = sink->channel_map;
- entry->volume = *pa_sink_get_volume(sink, FALSE);
- entry->volume_valid = TRUE;
+ if (sink->save_port) {
+ pa_xfree(e->port);
+ e->port = pa_xstrdup(port ? port : "");
+ e->port_valid = true;
}
- if (sink->save_muted) {
- entry->muted = pa_sink_get_mute(sink, FALSE);
- entry->muted_valid = TRUE;
- }
+ if ((oldppe = perportentry_read(u, name, port)))
+ ppe = perportentry_copy(oldppe);
+ else
+ ppe = perportentry_new(true);
- if (sink->save_port) {
- pa_xfree(entry->port);
- entry->port = pa_xstrdup(sink->active_port ? sink->active_port->name : "");
- entry->port_valid = TRUE;
+ if (sink->save_volume) {
+ ppe->channel_map = sink->channel_map;
+ ppe->volume = *pa_sink_get_volume(sink, false);
+ ppe->volume_valid = true;
}
+ if (sink->save_muted) {
+ ppe->muted = pa_sink_get_mute(sink, false);
+ ppe->muted_valid = true;
+ }
} else {
pa_source *source;
type = PA_DEVICE_TYPE_SOURCE;
name = pa_sprintf_malloc("source:%s", source->name);
+ if (source->active_port)
+ port = source->active_port->name;
- if ((old = entry_read(u, name)))
- entry = entry_copy(old);
+ if ((olde = entry_read(u, name)))
+ e = entry_copy(olde);
else
- entry = entry_new(TRUE);
+ e = entry_new();
+
+ if (source->save_port) {
+ pa_xfree(e->port);
+ e->port = pa_xstrdup(port ? port : "");
+ e->port_valid = true;
+ }
+
+ if ((oldppe = perportentry_read(u, name, port)))
+ ppe = perportentry_copy(oldppe);
+ else
+ ppe = perportentry_new(true);
if (source->save_volume) {
- entry->channel_map = source->channel_map;
- entry->volume = *pa_source_get_volume(source, FALSE);
- entry->volume_valid = TRUE;
+ ppe->channel_map = source->channel_map;
+ ppe->volume = *pa_source_get_volume(source, false);
+ ppe->volume_valid = true;
}
if (source->save_muted) {
- entry->muted = pa_source_get_mute(source, FALSE);
- entry->muted_valid = TRUE;
+ ppe->muted = pa_source_get_mute(source, false);
+ ppe->muted_valid = true;
}
+ }
- if (source->save_port) {
- pa_xfree(entry->port);
- entry->port = pa_xstrdup(source->active_port ? source->active_port->name : "");
- entry->port_valid = TRUE;
- }
+ pa_assert(e);
+
+ if (olde) {
+
+ if (entries_equal(olde, e)) {
+ entry_free(olde);
+ entry_free(e);
+ e = NULL;
+ } else
+ entry_free(olde);
}
- pa_assert(entry);
+ if (e) {
+ pa_log_info("Storing port for device %s.", name);
- if (old) {
+ written = entry_write(u, name, e);
- if (entries_equal(old, entry)) {
- entry_free(old);
- entry_free(entry);
- pa_xfree(name);
- return;
- }
+ entry_free(e);
+ }
- entry_free(old);
+ pa_assert(ppe);
+
+ if (oldppe) {
+
+ if (perportentries_equal(oldppe, ppe)) {
+ perportentry_free(oldppe);
+ perportentry_free(ppe);
+ ppe = NULL;
+ } else
+ perportentry_free(oldppe);
}
- pa_log_info("Storing volume/mute/port for device %s.", name);
+ if (ppe) {
+ pa_log_info("Storing volume/mute for device+port %s:%s.", name, (port ? port : "null"));
- if (entry_write(u, name, entry))
- trigger_save(u, type, idx);
+ written = perportentry_write(u, name, port, ppe) || written;
- entry_free(entry);
+ perportentry_free(ppe);
+ }
pa_xfree(name);
+
+ if (written)
+ trigger_save(u, type, idx);
}
static pa_hook_result_t sink_new_hook_callback(pa_core *c, pa_sink_new_data *new_data, struct userdata *u) {
if (!new_data->active_port) {
pa_log_info("Restoring port for sink %s.", name);
pa_sink_new_data_set_port(new_data, e->port);
- new_data->save_port = TRUE;
+ new_data->save_port = true;
} else
pa_log_debug("Not restoring port for sink %s, because already set.", name);
}
static pa_hook_result_t sink_fixate_hook_callback(pa_core *c, pa_sink_new_data *new_data, struct userdata *u) {
char *name;
- struct entry *e;
+ struct perportentry *e;
pa_assert(c);
pa_assert(new_data);
name = pa_sprintf_malloc("sink:%s", new_data->name);
- if ((e = entry_read(u, name))) {
+ if ((e = perportentry_read(u, name, new_data->active_port))) {
if (u->restore_volume && e->volume_valid) {
if (!new_data->volume_is_set) {
pa_cvolume v;
-
- pa_log_info("Restoring volume for sink %s.", new_data->name);
+ char buf[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
v = e->volume;
pa_cvolume_remap(&v, &e->channel_map, &new_data->channel_map);
pa_sink_new_data_set_volume(new_data, &v);
+ pa_log_info("Restoring volume for sink %s: %s", new_data->name,
+ pa_cvolume_snprint_verbose(buf, sizeof(buf), &new_data->volume, &new_data->channel_map, false));
- new_data->save_volume = TRUE;
+ new_data->save_volume = true;
} else
pa_log_debug("Not restoring volume for sink %s, because already set.", new_data->name);
}
if (u->restore_muted && e->muted_valid) {
if (!new_data->muted_is_set) {
- pa_log_info("Restoring mute state for sink %s.", new_data->name);
pa_sink_new_data_set_muted(new_data, e->muted);
- new_data->save_muted = TRUE;
+ new_data->save_muted = true;
+ pa_log_info("Restoring mute state for sink %s: %smuted", new_data->name,
+ new_data->muted ? "" : "un");
} else
pa_log_debug("Not restoring mute state for sink %s, because already set.", new_data->name);
}
- entry_free(e);
+ perportentry_free(e);
+ }
+
+ pa_xfree(name);
+
+ return PA_HOOK_OK;
+}
+
+static pa_hook_result_t sink_port_hook_callback(pa_core *c, pa_sink *sink, struct userdata *u) {
+ char *name;
+ struct perportentry *e;
+
+ pa_assert(c);
+ pa_assert(sink);
+ pa_assert(u);
+ pa_assert(u->restore_volume || u->restore_muted);
+
+ name = pa_sprintf_malloc("sink:%s", sink->name);
+
+ if ((e = perportentry_read(u, name, (sink->active_port ? sink->active_port->name : NULL)))) {
+
+ if (u->restore_volume && e->volume_valid) {
+ pa_cvolume v;
+
+ pa_log_info("Restoring volume for sink %s.", sink->name);
+ v = e->volume;
+ pa_cvolume_remap(&v, &e->channel_map, &sink->channel_map);
+ pa_sink_set_volume(sink, &v, true, false);
+
+ sink->save_volume = true;
+ }
+
+ if (u->restore_muted && e->muted_valid) {
+
+ pa_log_info("Restoring mute state for sink %s.", sink->name);
+ pa_sink_set_mute(sink, e->muted, false);
+ sink->save_muted = true;
+ }
+
+ perportentry_free(e);
}
pa_xfree(name);
static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, struct userdata *u) {
char *name;
- struct entry *e;
+ struct perportentry *e;
pa_assert(c);
pa_assert(sink);
name = pa_sprintf_malloc("sink:%s", sink->name);
- if ((e = entry_read(u, name))) {
+ if ((e = perportentry_read(u, name, (sink->active_port ? sink->active_port->name : NULL)))) {
if (!pa_sink_set_formats(sink, e->formats))
pa_log_debug("Could not set format on sink %s", sink->name);
- entry_free(e);
+ perportentry_free(e);
}
pa_xfree(name);
if (!new_data->active_port) {
pa_log_info("Restoring port for source %s.", name);
pa_source_new_data_set_port(new_data, e->port);
- new_data->save_port = TRUE;
+ new_data->save_port = true;
} else
pa_log_debug("Not restoring port for source %s, because already set.", name);
}
static pa_hook_result_t source_fixate_hook_callback(pa_core *c, pa_source_new_data *new_data, struct userdata *u) {
char *name;
- struct entry *e;
+ struct perportentry *e;
pa_assert(c);
pa_assert(new_data);
name = pa_sprintf_malloc("source:%s", new_data->name);
- if ((e = entry_read(u, name))) {
+ if ((e = perportentry_read(u, name, new_data->active_port))) {
if (u->restore_volume && e->volume_valid) {
if (!new_data->volume_is_set) {
pa_cvolume v;
-
- pa_log_info("Restoring volume for source %s.", new_data->name);
+ char buf[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
v = e->volume;
pa_cvolume_remap(&v, &e->channel_map, &new_data->channel_map);
pa_source_new_data_set_volume(new_data, &v);
+ pa_log_info("Restoring volume for source %s: %s", new_data->name,
+ pa_cvolume_snprint_verbose(buf, sizeof(buf), &new_data->volume, &new_data->channel_map, false));
- new_data->save_volume = TRUE;
+ new_data->save_volume = true;
} else
pa_log_debug("Not restoring volume for source %s, because already set.", new_data->name);
}
if (u->restore_muted && e->muted_valid) {
if (!new_data->muted_is_set) {
- pa_log_info("Restoring mute state for source %s.", new_data->name);
pa_source_new_data_set_muted(new_data, e->muted);
- new_data->save_muted = TRUE;
+ new_data->save_muted = true;
+ pa_log_info("Restoring mute state for source %s: %smuted", new_data->name,
+ new_data->muted ? "" : "un");
} else
pa_log_debug("Not restoring mute state for source %s, because already set.", new_data->name);
}
- entry_free(e);
+ perportentry_free(e);
+ }
+
+ pa_xfree(name);
+
+ return PA_HOOK_OK;
+}
+
+static pa_hook_result_t source_port_hook_callback(pa_core *c, pa_source *source, struct userdata *u) {
+ char *name;
+ struct perportentry *e;
+
+ pa_assert(c);
+ pa_assert(source);
+ pa_assert(u);
+ pa_assert(u->restore_volume || u->restore_muted);
+
+ name = pa_sprintf_malloc("source:%s", source->name);
+
+ if ((e = perportentry_read(u, name, (source->active_port ? source->active_port->name : NULL)))) {
+
+ if (u->restore_volume && e->volume_valid) {
+ pa_cvolume v;
+
+ pa_log_info("Restoring volume for source %s.", source->name);
+ v = e->volume;
+ pa_cvolume_remap(&v, &e->channel_map, &source->channel_map);
+ pa_source_set_volume(source, &v, true, false);
+
+ source->save_volume = true;
+ }
+
+ if (u->restore_muted && e->muted_valid) {
+
+ pa_log_info("Restoring mute state for source %s.", source->name);
+ pa_source_set_mute(source, e->muted, false);
+ source->save_muted = true;
+ }
+
+ perportentry_free(e);
}
pa_xfree(name);
#define EXT_VERSION 1
static void read_sink_format_reply(struct userdata *u, pa_tagstruct *reply, pa_sink *sink) {
- struct entry *e;
+ struct perportentry *e;
char *name;
pa_assert(u);
/* Read or create an entry */
name = pa_sprintf_malloc("sink:%s", sink->name);
- if (!(e = entry_read(u, name))) {
+ if (!(e = perportentry_read(u, name, (sink->active_port ? sink->active_port->name : NULL)))) {
/* Fake a reply with PCM encoding supported */
pa_format_info *f = pa_format_info_new();
case SUBCOMMAND_SUBSCRIBE: {
- pa_bool_t enabled;
+ bool enabled;
if (pa_tagstruct_get_boolean(t, &enabled) < 0 ||
!pa_tagstruct_eof(t))
case SUBCOMMAND_SAVE_FORMATS: {
- struct entry *e;
+ struct perportentry *e;
pa_device_type_t type;
uint32_t sink_index;
char *name;
/* Read or create an entry */
name = pa_sprintf_malloc("sink:%s", sink->name);
- if (!(e = entry_read(u, name)))
- e = entry_new(FALSE);
+ if (!(e = perportentry_read(u, name, (sink->active_port ? sink->active_port->name : NULL))))
+ e = perportentry_new(false);
else {
/* Clean out any saved formats */
- pa_idxset_free(e->formats, (pa_free2_cb_t) pa_format_info_free2, NULL);
+ pa_idxset_free(e->formats, (pa_free_cb_t) pa_format_info_free);
e->formats = pa_idxset_new(NULL, NULL);
}
pa_format_info *f = pa_format_info_new();
if (pa_tagstruct_get_format_info(t, f) < 0) {
pa_format_info_free(f);
+ perportentry_free(e);
pa_xfree(name);
goto fail;
}
}
if (!pa_tagstruct_eof(t)) {
- entry_free(e);
+ perportentry_free(e);
pa_xfree(name);
goto fail;
}
- if (pa_sink_set_formats(sink, e->formats) && entry_write(u, name, e))
+ if (pa_sink_set_formats(sink, e->formats) && perportentry_write(u, name, (sink->active_port ? sink->active_port->name : NULL), e))
trigger_save(u, type, sink_index);
else
pa_log_warn("Could not save format info for sink %s", sink->name);
pa_xfree(name);
- entry_free(e);
+ perportentry_free(e);
break;
}
pa_sink *sink;
pa_source *source;
uint32_t idx;
- pa_bool_t restore_volume = TRUE, restore_muted = TRUE, restore_port = TRUE, restore_formats = TRUE;
+ bool restore_volume = true, restore_muted = true, restore_port = true, restore_formats = true;
pa_assert(m);
if (restore_muted || restore_volume) {
u->sink_fixate_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_FIXATE], PA_HOOK_EARLY, (pa_hook_cb_t) sink_fixate_hook_callback, u);
u->source_fixate_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_FIXATE], PA_HOOK_EARLY, (pa_hook_cb_t) source_fixate_hook_callback, u);
+
+ u->sink_port_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PORT_CHANGED], PA_HOOK_EARLY, (pa_hook_cb_t) sink_port_hook_callback, u);
+ u->source_port_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PORT_CHANGED], PA_HOOK_EARLY, (pa_hook_cb_t) source_port_hook_callback, u);
}
if (restore_formats)
u->sink_put_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_EARLY, (pa_hook_cb_t) sink_put_hook_callback, u);
- if (!(fname = pa_state_path("device-volumes", TRUE)))
+ if (!(fname = pa_state_path("device-volumes", 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;
pa_log_info("Successfully opened database file '%s'.", fname);
pa_xfree(fname);
- for (sink = pa_idxset_first(m->core->sinks, &idx); sink; sink = pa_idxset_next(m->core->sinks, &idx))
+ PA_IDXSET_FOREACH(sink, m->core->sinks, idx)
subscribe_callback(m->core, PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_NEW, sink->index, u);
- for (source = pa_idxset_first(m->core->sources, &idx); source; source = pa_idxset_next(m->core->sources, &idx))
+ PA_IDXSET_FOREACH(source, m->core->sources, idx)
subscribe_callback(m->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_NEW, source->index, u);
pa_modargs_free(ma);
pa_hook_slot_free(u->sink_new_hook_slot);
if (u->source_new_hook_slot)
pa_hook_slot_free(u->source_new_hook_slot);
+ if (u->sink_port_hook_slot)
+ pa_hook_slot_free(u->sink_port_hook_slot);
+ if (u->source_port_hook_slot)
+ pa_hook_slot_free(u->source_port_hook_slot);
if (u->sink_put_hook_slot)
pa_hook_slot_free(u->sink_put_hook_slot);
}
if (u->subscribed)
- pa_idxset_free(u->subscribed, NULL, NULL);
+ pa_idxset_free(u->subscribed, NULL);
pa_xfree(u);
}