summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2008-11-10 15:43:05 +0200
committerLennart Poettering <lennart@poettering.net>2009-01-15 19:20:33 +0100
commit43762ed620589a9007b0c6b77022eb2ea1c6d926 (patch)
treebd593ad6a9eb2a67935f3b651799517c5ce9d99d
parenta861ffacc490c690da8f05077be1efb7d4e2895c (diff)
flat-volume: use pa_sink_get_volume(s, TRUE) to work with slaved sink
-rw-r--r--src/modules/module-flat-volume.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/module-flat-volume.c b/src/modules/module-flat-volume.c
index 9bc8055a..fe6dc928 100644
--- a/src/modules/module-flat-volume.c
+++ b/src/modules/module-flat-volume.c
@@ -94,11 +94,11 @@ static void process_input_volume_change(
}
/* Set the master volume, and normalize inputs */
- if (!pa_cvolume_equal(&max_volume, &sink->volume)) {
+ if (!pa_cvolume_equal(&max_volume, pa_sink_get_volume(sink, TRUE))) {
pa_sink_set_volume(sink, &max_volume);
- pa_log_debug("sink = %.2f (changed)", (double)pa_cvolume_avg(&sink->volume)/PA_VOLUME_NORM);
+ pa_log_debug("sink = %.2f (changed)", (double)pa_cvolume_avg(pa_sink_get_volume(sink, TRUE))/PA_VOLUME_NORM);
/* Now, normalize each of the internal volume (client sink-input volume / sink master volume) */
for (i = PA_SINK_INPUT(pa_idxset_first(sink->inputs, &idx)); i; i = PA_SINK_INPUT(pa_idxset_next(sink->inputs, &idx))) {
@@ -116,7 +116,7 @@ static void process_input_volume_change(
pa_asyncmsgq_post(i->sink->asyncmsgq, PA_MSGOBJECT(i), PA_SINK_INPUT_MESSAGE_SET_VOLUME, pa_xnewdup(struct pa_cvolume, &i->volume, 1), 0, NULL, pa_xfree);
}
} else
- pa_log_debug("sink = %.2f", (double)pa_cvolume_avg(&sink->volume)/PA_VOLUME_NORM);
+ pa_log_debug("sink = %.2f", (double)pa_cvolume_avg(pa_sink_get_volume(sink, TRUE))/PA_VOLUME_NORM);
/* and this one */
@@ -170,9 +170,9 @@ static void subscribe_callback(pa_core *core, pa_subscription_event_type_t t, ui
return;
pa_log_debug("Sink volume changed");
- pa_log_debug("sink = %.2f", (double)pa_cvolume_avg(pa_sink_get_volume(sink, FALSE)) / PA_VOLUME_NORM);
+ pa_log_debug("sink = %.2f", (double)pa_cvolume_avg(pa_sink_get_volume(sink, TRUE)) / PA_VOLUME_NORM);
- sink_volume = *pa_sink_get_volume(sink, FALSE);
+ sink_volume = *pa_sink_get_volume(sink, TRUE);
for (i = PA_SINK_INPUT(pa_idxset_first(sink->inputs, &iidx)); i; i = PA_SINK_INPUT(pa_idxset_next(sink->inputs, &iidx))) {
pa_cvolume si_volume;