diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-01-27 23:35:55 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-01-27 23:40:03 +0100 |
commit | 64b05435889678dcb154c460063395855659485e (patch) | |
tree | 880071bbd1b81710c34ff2dec8f8119ea29aac61 /src/modules | |
parent | ee17772cea3471b0e44fd1598f7ababa4100db0c (diff) |
when changing volume, store whether it is worth remembering or no
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/alsa/module-alsa-card.c | 4 | ||||
-rw-r--r-- | src/modules/module-match.c | 2 | ||||
-rw-r--r-- | src/modules/module-rescue-streams.c | 4 | ||||
-rw-r--r-- | src/modules/module-stream-restore.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c index 8f192c2e..e63414ec 100644 --- a/src/modules/alsa/module-alsa-card.c +++ b/src/modules/alsa/module-alsa-card.c @@ -177,7 +177,7 @@ static int card_set_profile(pa_card *c, pa_card_profile *new_profile) { if (inputs) { if (u->sink) - pa_sink_move_all_finish(u->sink, inputs); + pa_sink_move_all_finish(u->sink, inputs, FALSE); else pa_sink_move_all_fail(inputs); } @@ -200,7 +200,7 @@ static int card_set_profile(pa_card *c, pa_card_profile *new_profile) { if (outputs) { if (u->source) - pa_source_move_all_finish(u->source, outputs); + pa_source_move_all_finish(u->source, outputs, FALSE); else pa_source_move_all_fail(outputs); } diff --git a/src/modules/module-match.c b/src/modules/module-match.c index 8c825c4f..cbf62687 100644 --- a/src/modules/module-match.c +++ b/src/modules/module-match.c @@ -216,7 +216,7 @@ static void callback(pa_core *c, pa_subscription_event_type_t t, uint32_t idx, v pa_cvolume cv; pa_log_debug("changing volume of sink input '%s' to 0x%03x", n, r->volume); pa_cvolume_set(&cv, si->sample_spec.channels, r->volume); - pa_sink_input_set_volume(si, &cv); + pa_sink_input_set_volume(si, &cv, TRUE); } } } diff --git a/src/modules/module-rescue-streams.c b/src/modules/module-rescue-streams.c index 07a0237f..e52e39c1 100644 --- a/src/modules/module-rescue-streams.c +++ b/src/modules/module-rescue-streams.c @@ -77,7 +77,7 @@ static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* user } while ((i = pa_idxset_first(sink->inputs, NULL))) { - if (pa_sink_input_move_to(i, target) < 0) { + if (pa_sink_input_move_to(i, target, FALSE) < 0) { pa_log_warn("Failed to move sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name); return PA_HOOK_OK; } @@ -121,7 +121,7 @@ static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void pa_assert(target != source); while ((o = pa_idxset_first(source->outputs, NULL))) { - if (pa_source_output_move_to(o, target) < 0) { + if (pa_source_output_move_to(o, target, FALSE) < 0) { pa_log_warn("Failed to move source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name); return PA_HOOK_OK; } diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c index 464ff2da..f2982315 100644 --- a/src/modules/module-stream-restore.c +++ b/src/modules/module-stream-restore.c @@ -438,14 +438,14 @@ static void apply_entry(struct userdata *u, const char *name, struct entry *e) { if (u->restore_muted) { pa_log_info("Restoring mute state for sink input %s.", name); - pa_sink_input_set_mute(si, e->muted); + pa_sink_input_set_mute(si, e->muted, TRUE); } if (u->restore_device && (s = pa_namereg_get(u->core, e->device, PA_NAMEREG_SOURCE))) { pa_log_info("Restoring device for stream %s.", name); - pa_sink_input_move_to(si, s); + pa_sink_input_move_to(si, s, TRUE); } } @@ -465,7 +465,7 @@ static void apply_entry(struct userdata *u, const char *name, struct entry *e) { (s = pa_namereg_get(u->core, e->device, PA_NAMEREG_SOURCE))) { pa_log_info("Restoring device for stream %s.", name); - pa_source_output_move_to(so, s); + pa_source_output_move_to(so, s, TRUE); } } } |