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

don't restore mute/volume when already set

Browse source
This commit is contained in:
Lennart Poettering 2009-01-21 02:47:26 +01:00
parent 9661cd0444
commit 10e5c70286
1 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/modules/module-device-restore.c
View file

@ -98,14 +98,14 @@ static void save_time_callback(pa_mainloop_api*a, pa_time_event* e, const struct
pa_log_info("Synced."); pa_log_info("Synced.");
} }
static struct entry* read_entry(struct userdata *u, char *name) { static struct entry* read_entry(struct userdata *u, const char *name) {
datum key, data; datum key, data;
struct entry *e; struct entry *e;
pa_assert(u); pa_assert(u);
pa_assert(name); pa_assert(name);
key.dptr = name; key.dptr = (char*) name;
key.dsize = (int) strlen(name); key.dsize = (int) strlen(name);
data = gdbm_fetch(u->gdbm_file, key); data = gdbm_fetch(u->gdbm_file, key);
@ -235,13 +235,22 @@ static pa_hook_result_t sink_fixate_hook_callback(pa_core *c, pa_sink_new_data *
if ((e = read_entry(u, name))) { if ((e = read_entry(u, name))) {
if (u->restore_volume) { if (u->restore_volume) {
pa_log_info("Restoring volume for sink %s.", new_data->name);
pa_sink_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map)); if (!new_data->volume_is_set) {
pa_log_info("Restoring volume for sink %s.", new_data->name);
pa_sink_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map));
} else
pa_log_debug("Not restoring volume for sink %s, because already set.", new_data->name);
} }
if (u->restore_muted) { if (u->restore_muted) {
pa_log_info("Restoring mute state for sink %s.", new_data->name);
pa_sink_new_data_set_muted(new_data, e->muted); 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);
} else
pa_log_debug("Not restoring mute state for sink %s, because already set.", new_data->name);
} }
pa_xfree(e); pa_xfree(e);
@ -263,13 +272,21 @@ static pa_hook_result_t source_fixate_hook_callback(pa_core *c, pa_source_new_da
if ((e = read_entry(u, name))) { if ((e = read_entry(u, name))) {
if (u->restore_volume) { if (u->restore_volume) {
pa_log_info("Restoring volume for source %s.", new_data->name);
pa_source_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map)); if (!new_data->volume_is_set) {
pa_log_info("Restoring volume for source %s.", new_data->name);
pa_source_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map));
} else
pa_log_debug("Not restoring volume for source %s, because already set.", new_data->name);
} }
if (u->restore_muted) { if (u->restore_muted) {
pa_log_info("Restoring mute state for source %s.", new_data->name);
pa_source_new_data_set_muted(new_data, e->muted); 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);
} else
pa_log_debug("Not restoring mute state for source %s, because already set.", new_data->name);
} }
pa_xfree(e); pa_xfree(e);