Split rolewidget into it's own files.

src/Makefile.am

@@ -33,6 +33,7 @@ pavucontrol_SOURCES= \
   sourcewidget.h sourcewidget.cc \
   sinkinputwidget.h sinkinputwidget.cc \
   sourceoutputwidget.h sourceoutputwidget.cc \
+  rolewidget.h rolewidget.cc \
   mainwindow.h \
   pavucontrol.h pavucontrol.cc \
   i18n.h

src/pavucontrol.cc

@@ -39,23 +39,12 @@
 #include "sourcewidget.h"
 #include "sinkinputwidget.h"
 #include "sourceoutputwidget.h"
+#include "rolewidget.h"
 #include "mainwindow.h"
 
 static pa_context *context = NULL;
 static int n_outstanding = 0;
 
-class RoleWidget : public StreamWidget {
-public:
-    RoleWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x);
-    static RoleWidget* create();
-
-    Glib::ustring role;
-    Glib::ustring device;
-
-    virtual void onMuteToggleButton();
-    virtual void executeVolumeUpdate();
-};
-
 void show_error(const char *txt) {
     char buf[256];
 
@@ -68,48 +57,6 @@ void show_error(const char *txt) {
 }
 
 
-RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
-    StreamWidget(cobject, x) {
-
-    lockToggleButton->hide();
-    streamToggleButton->hide();
-}
-
-RoleWidget* RoleWidget::create() {
-    RoleWidget* w;
-    Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget");
-    x->get_widget_derived("streamWidget", w);
-    return w;
-}
-
-void RoleWidget::onMuteToggleButton() {
-    StreamWidget::onMuteToggleButton();
-
-    executeVolumeUpdate();
-}
-
-void RoleWidget::executeVolumeUpdate() {
-    pa_ext_stream_restore_info info;
-
-    if (updating)
-        return;
-
-    info.name = role.c_str();
-    info.channel_map.channels = 1;
-    info.channel_map.map[0] = PA_CHANNEL_POSITION_MONO;
-    info.volume = volume;
-    info.device = device == "" ? NULL : device.c_str();
-    info.mute = muteToggleButton->get_active();
-
-    pa_operation* o;
-    if (!(o = pa_ext_stream_restore_write(context, PA_UPDATE_REPLACE, &info, 1, TRUE, NULL, NULL))) {
-        show_error(_("pa_ext_stream_restore_write() failed"));
-        return;
-    }
-
-    pa_operation_unref(o);
-}
-
 /*** MainWindow ***/
 
 MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :

src/rolewidget.cc

@@ -0,0 +1,68 @@
+/***
+  This file is part of pavucontrol.
+
+  Copyright 2006-2008 Lennart Poettering
+  Copyright 2009 Colin Guthrie
+
+  pavucontrol is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  pavucontrol is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "rolewidget.h"
+
+#include <pulse/ext-stream-restore.h>
+
+#include "i18n.h"
+
+RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
+    StreamWidget(cobject, x) {
+
+    lockToggleButton->hide();
+    streamToggleButton->hide();
+}
+
+RoleWidget* RoleWidget::create() {
+    RoleWidget* w;
+    Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget");
+    x->get_widget_derived("streamWidget", w);
+    return w;
+}
+
+void RoleWidget::onMuteToggleButton() {
+    StreamWidget::onMuteToggleButton();
+
+    executeVolumeUpdate();
+}
+
+void RoleWidget::executeVolumeUpdate() {
+    pa_ext_stream_restore_info info;
+
+    if (updating)
+        return;
+
+    info.name = role.c_str();
+    info.channel_map.channels = 1;
+    info.channel_map.map[0] = PA_CHANNEL_POSITION_MONO;
+    info.volume = volume;
+    info.device = device == "" ? NULL : device.c_str();
+    info.mute = muteToggleButton->get_active();
+
+    pa_operation* o;
+    if (!(o = pa_ext_stream_restore_write(get_context(), PA_UPDATE_REPLACE, &info, 1, TRUE, NULL, NULL))) {
+        show_error(_("pa_ext_stream_restore_write() failed"));
+        return;
+    }
+
+    pa_operation_unref(o);
+}
+

src/rolewidget.h

@@ -0,0 +1,40 @@
+/***
+  This file is part of pavucontrol.
+
+  Copyright 2006-2008 Lennart Poettering
+  Copyright 2009 Colin Guthrie
+
+  pavucontrol is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  pavucontrol is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with pavucontrol. If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#ifndef rolewidget_h
+#define rolewidget_h
+
+#include "pavucontrol.h"
+
+#include "streamwidget.h"
+
+class RoleWidget : public StreamWidget {
+public:
+    RoleWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x);
+    static RoleWidget* create();
+
+    Glib::ustring role;
+    Glib::ustring device;
+
+    virtual void onMuteToggleButton();
+    virtual void executeVolumeUpdate();
+};
+
+#endif