From cf3da7b364acb39b1b44e8f02d5342c03994ace0 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 16 Mar 2009 13:13:34 +0000 Subject: Split rolewidget into it's own files. --- src/Makefile.am | 1 + src/pavucontrol.cc | 55 +------------------------------------------ src/rolewidget.cc | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/rolewidget.h | 40 ++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 54 deletions(-) create mode 100644 src/rolewidget.cc create mode 100644 src/rolewidget.h (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 950e32f..49f5223 100644 --- a/src/Makefile.am +++ b/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 diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc index ebabf6c..d1af3d8 100644 --- a/src/pavucontrol.cc +++ b/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& 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& x) : - StreamWidget(cobject, x) { - - lockToggleButton->hide(); - streamToggleButton->hide(); -} - -RoleWidget* RoleWidget::create() { - RoleWidget* w; - Glib::RefPtr 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& x) : diff --git a/src/rolewidget.cc b/src/rolewidget.cc new file mode 100644 index 0000000..19f3f5b --- /dev/null +++ b/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 . +***/ + +#include "rolewidget.h" + +#include + +#include "i18n.h" + +RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : + StreamWidget(cobject, x) { + + lockToggleButton->hide(); + streamToggleButton->hide(); +} + +RoleWidget* RoleWidget::create() { + RoleWidget* w; + Glib::RefPtr 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); +} + diff --git a/src/rolewidget.h b/src/rolewidget.h new file mode 100644 index 0000000..bbd39d6 --- /dev/null +++ b/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 . +***/ + +#ifndef rolewidget_h +#define rolewidget_h + +#include "pavucontrol.h" + +#include "streamwidget.h" + +class RoleWidget : public StreamWidget { +public: + RoleWidget(BaseObjectType* cobject, const Glib::RefPtr& x); + static RoleWidget* create(); + + Glib::ustring role; + Glib::ustring device; + + virtual void onMuteToggleButton(); + virtual void executeVolumeUpdate(); +}; + +#endif -- cgit