From ddd7d06ddec0ff76df434ce561a8173ebe9db5c5 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <cguthrie@mandriva.org>
Date: Sun, 22 Mar 2009 16:38:57 +0000
Subject: Move the setBaseVolume()/setSteps() methods to devicewidget (problem
 found after rebasing)

---
 src/devicewidget.cc | 12 ++++++++++++
 src/devicewidget.h  |  2 ++
 src/streamwidget.cc | 13 -------------
 src/streamwidget.h  |  2 --
 4 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/devicewidget.cc b/src/devicewidget.cc
index 270a080..b7b3d74 100644
--- a/src/devicewidget.cc
+++ b/src/devicewidget.cc
@@ -107,3 +107,15 @@ bool DeviceWidget::timeoutEvent() {
 
 void DeviceWidget::executeVolumeUpdate() {
 }
+
+void DeviceWidget::setBaseVolume(pa_volume_t v) {
+
+    if (channelMap.channels > 0)
+        channelWidgets[channelMap.channels-1]->setBaseVolume(v);
+}
+
+void DeviceWidget::setSteps(unsigned n) {
+
+    for (int i = 0; i < channelMap.channels; i++)
+        channelWidgets[channelMap.channels-1]->setSteps(n);
+}
diff --git a/src/devicewidget.h b/src/devicewidget.h
index fcf4e91..90f437b 100644
--- a/src/devicewidget.h
+++ b/src/devicewidget.h
@@ -50,6 +50,8 @@ public:
     bool timeoutEvent();
 
     virtual void executeVolumeUpdate();
+    virtual void setBaseVolume(pa_volume_t v);
+    virtual void setSteps(unsigned n);
 };
 
 #endif
diff --git a/src/streamwidget.cc b/src/streamwidget.cc
index b7b23dc..b739676 100644
--- a/src/streamwidget.cc
+++ b/src/streamwidget.cc
@@ -109,16 +109,3 @@ bool StreamWidget::timeoutEvent() {
 
 void StreamWidget::executeVolumeUpdate() {
 }
-
-
-void StreamWidget::setBaseVolume(pa_volume_t v) {
-
-    if (channelMap.channels > 0)
-        channelWidgets[channelMap.channels-1]->setBaseVolume(v);
-}
-
-void StreamWidget::setSteps(unsigned n) {
-
-    for (int i = 0; i < channelMap.channels; i++)
-        channelWidgets[channelMap.channels-1]->setSteps(n);
-}
diff --git a/src/streamwidget.h b/src/streamwidget.h
index 56b95d0..6dfb67c 100644
--- a/src/streamwidget.h
+++ b/src/streamwidget.h
@@ -54,8 +54,6 @@ public:
     bool timeoutEvent();
 
     virtual void executeVolumeUpdate();
-    virtual void setBaseVolume(pa_volume_t v);
-    virtual void setSteps(unsigned n);
 
 protected:
   Gtk::ComboBox *deviceCombo;
-- 
cgit