[pulseaudio-commits] 2 commits - src/mainwindow.cc src/pavucontrol.h

[Colin Guthrie]

 src/mainwindow.cc |    2 ++
 src/pavucontrol.h |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0087ef0d60cf8c77f39f3aa74cc1c7d490a7d8b2
Author: Colin Guthrie <colin at mageia.org>
Date:   Fri Jul 22 10:18:40 2011 +0100

    source-output: We will officially support source output volumes in 0.99

diff --git a/src/pavucontrol.h b/src/pavucontrol.h
index 922f567..e16c20e 100644
--- a/src/pavucontrol.h
+++ b/src/pavucontrol.h
@@ -39,7 +39,7 @@
 # define PA_VOLUME_UI_MAX (pa_sw_volume_from_dB(+11.0))
 #endif
 
-#define HAVE_SOURCE_OUTPUT_VOLUMES PA_CHECK_VERSION(1,0,0)
+#define HAVE_SOURCE_OUTPUT_VOLUMES PA_CHECK_VERSION(0,99,0)
 
 enum SinkInputType {
     SINK_INPUT_ALL,

commit ca9c74b0429311eba2b488cbb7aae6d6e8500093
Author: Colin Guthrie <colin at mageia.org>
Date:   Fri Jul 22 10:01:48 2011 +0100

    source-output: Don't set the channel map for the SO if we do not support SO volumes.
    
    The setting of the channel map triggers the display of the actual volume sliders
    so it is essential that we do not set it when we don't want to.

diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index 1ae0fb0..7e49e36 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -606,7 +606,9 @@ void MainWindow::updateSourceOutput(const pa_source_output_info &info) {
         w = sourceOutputWidgets[info.index];
     else {
         sourceOutputWidgets[info.index] = w = SourceOutputWidget::create(this);
+#if HAVE_SOURCE_OUTPUT_VOLUMES
         w->setChannelMap(info.channel_map, true);
+#endif
         recsVBox->pack_start(*w, false, false, 0);
         w->index = info.index;
         w->clientIndex = info.client;