summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2011-07-21 06:50:56 +0300
committerColin Guthrie <colin@mageia.org>2011-07-21 20:38:57 +0100
commit1824f6de6a6e2429b9835a8da24204a09b0aa9a0 (patch)
tree48cdb99be2619c861fe307bf6246b708dfecf850
parentcf0bf5a4c25fc363476620fd875da333e140dd8f (diff)
virtual: Fix volume callback setting.
We want to set the volume callbacks only if volume sharing is not used. When volume sharing is used, we don't want to mess with the stream volumes. This was broken in 6c6b50
-rw-r--r--src/modules/module-virtual-sink.c2
-rw-r--r--src/modules/module-virtual-source.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/module-virtual-sink.c b/src/modules/module-virtual-sink.c
index b52a29bfa..0a410e44d 100644
--- a/src/modules/module-virtual-sink.c
+++ b/src/modules/module-virtual-sink.c
@@ -567,7 +567,7 @@ int pa__init(pa_module*m) {
u->sink->update_requested_latency = sink_update_requested_latency_cb;
u->sink->request_rewind = sink_request_rewind_cb;
pa_sink_set_set_mute_callback(u->sink, sink_set_mute_cb);
- if (use_volume_sharing) {
+ if (!use_volume_sharing) {
pa_sink_set_set_volume_callback(u->sink, sink_set_volume_cb);
pa_sink_enable_decibel_volume(u->sink, TRUE);
}
diff --git a/src/modules/module-virtual-source.c b/src/modules/module-virtual-source.c
index 7bcecfacf..b7f698275 100644
--- a/src/modules/module-virtual-source.c
+++ b/src/modules/module-virtual-source.c
@@ -594,7 +594,7 @@ int pa__init(pa_module*m) {
u->source->set_state = source_set_state_cb;
u->source->update_requested_latency = source_update_requested_latency_cb;
pa_source_set_set_mute_callback(u->source, source_set_mute_cb);
- if (use_volume_sharing) {
+ if (!use_volume_sharing) {
pa_source_set_set_volume_callback(u->source, source_set_volume_cb);
pa_source_enable_decibel_volume(u->source, TRUE);
}