From 0d746559c3ed50047e3eb7ba9e4d3a3a9321dc83 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 16 Mar 2009 13:05:58 +0000 Subject: [PATCH] Split sourceoutputwidget out into it's own files. --- src/Makefile.am | 1 + src/pavucontrol.cc | 116 +------------------------------------- src/sourceoutputwidget.cc | 102 +++++++++++++++++++++++++++++++++ src/sourceoutputwidget.h | 68 ++++++++++++++++++++++ 4 files changed, 172 insertions(+), 115 deletions(-) create mode 100644 src/sourceoutputwidget.cc create mode 100644 src/sourceoutputwidget.h diff --git a/src/Makefile.am b/src/Makefile.am index 0e3560e..950e32f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,6 +32,7 @@ pavucontrol_SOURCES= \ sinkwidget.h sinkwidget.cc \ sourcewidget.h sourcewidget.cc \ sinkinputwidget.h sinkinputwidget.cc \ + sourceoutputwidget.h sourceoutputwidget.cc \ mainwindow.h \ pavucontrol.h pavucontrol.cc \ i18n.h diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc index a123ca3..ebabf6c 100644 --- a/src/pavucontrol.cc +++ b/src/pavucontrol.cc @@ -38,49 +38,12 @@ #include "sinkwidget.h" #include "sourcewidget.h" #include "sinkinputwidget.h" +#include "sourceoutputwidget.h" #include "mainwindow.h" static pa_context *context = NULL; static int n_outstanding = 0; -class SourceOutputWidget : public MinimalStreamWidget { -public: - SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr& x); - static SourceOutputWidget* create(); - virtual ~SourceOutputWidget(); - - SourceOutputType type; - - uint32_t index, clientIndex, sourceIndex; - virtual void onKill(); - - MainWindow *mainWindow; - Gtk::Menu submenu; - Gtk::MenuItem titleMenuItem, killMenuItem; - - struct SourceMenuItem { - SourceMenuItem(SourceOutputWidget *w, const char *label, uint32_t i, bool active) : - widget(w), - menuItem(label), - index(i) { - menuItem.set_active(active); - menuItem.set_draw_as_radio(true); - menuItem.signal_toggled().connect(sigc::mem_fun(*this, &SourceMenuItem::onToggle)); - } - - SourceOutputWidget *widget; - Gtk::CheckMenuItem menuItem; - uint32_t index; - void onToggle(); - }; - - std::map sourceMenuItems; - - void clearMenu(); - void buildMenu(); - virtual void prepareMenu(); -}; - class RoleWidget : public StreamWidget { public: RoleWidget(BaseObjectType* cobject, const Glib::RefPtr& x); @@ -105,83 +68,6 @@ void show_error(const char *txt) { } -SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : - MinimalStreamWidget(cobject, x), - mainWindow(NULL), - titleMenuItem(_("_Move Stream..."), true), - killMenuItem(_("_Terminate Stream"), true) { - - add_events(Gdk::BUTTON_PRESS_MASK); - - menu.append(titleMenuItem); - titleMenuItem.set_submenu(submenu); - - menu.append(killMenuItem); - killMenuItem.signal_activate().connect(sigc::mem_fun(*this, &SourceOutputWidget::onKill)); -} - -SourceOutputWidget::~SourceOutputWidget() { - clearMenu(); -} - -SourceOutputWidget* SourceOutputWidget::create() { - SourceOutputWidget* w; - Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget"); - x->get_widget_derived("streamWidget", w); - return w; -} - -void SourceOutputWidget::onKill() { - pa_operation* o; - if (!(o = pa_context_kill_source_output(context, index, NULL, NULL))) { - show_error(_("pa_context_kill_source_output() failed")); - return; - } - - pa_operation_unref(o); -} - -void SourceOutputWidget::clearMenu() { - - while (!sourceMenuItems.empty()) { - std::map::iterator i = sourceMenuItems.begin(); - delete i->second; - sourceMenuItems.erase(i); - } -} - -void SourceOutputWidget::buildMenu() { - for (std::map::iterator i = mainWindow->sourceWidgets.begin(); i != mainWindow->sourceWidgets.end(); ++i) { - SourceMenuItem *m; - sourceMenuItems[i->second->index] = m = new SourceMenuItem(this, i->second->description.c_str(), i->second->index, i->second->index == sourceIndex); - submenu.append(m->menuItem); - } - - menu.show_all(); -} - -void SourceOutputWidget::prepareMenu(void) { - clearMenu(); - buildMenu(); -} - -void SourceOutputWidget::SourceMenuItem::onToggle() { - - if (widget->updating) - return; - - if (!menuItem.get_active()) - return; - - pa_operation* o; - if (!(o = pa_context_move_source_output_by_index(context, widget->index, index, NULL, NULL))) { - show_error(_("pa_context_move_source_output_by_index() failed")); - return; - } - - pa_operation_unref(o); -} - RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : StreamWidget(cobject, x) { diff --git a/src/sourceoutputwidget.cc b/src/sourceoutputwidget.cc new file mode 100644 index 0000000..20f50de --- /dev/null +++ b/src/sourceoutputwidget.cc @@ -0,0 +1,102 @@ +/*** + 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 "sourceoutputwidget.h" +#include "mainwindow.h" +#include "sourcewidget.h" + +#include "i18n.h" + +SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : + MinimalStreamWidget(cobject, x), + mainWindow(NULL), + titleMenuItem(_("_Move Stream..."), true), + killMenuItem(_("_Terminate Stream"), true) { + + add_events(Gdk::BUTTON_PRESS_MASK); + + menu.append(titleMenuItem); + titleMenuItem.set_submenu(submenu); + + menu.append(killMenuItem); + killMenuItem.signal_activate().connect(sigc::mem_fun(*this, &SourceOutputWidget::onKill)); +} + +SourceOutputWidget::~SourceOutputWidget() { + clearMenu(); +} + +SourceOutputWidget* SourceOutputWidget::create() { + SourceOutputWidget* w; + Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget"); + x->get_widget_derived("streamWidget", w); + return w; +} + +void SourceOutputWidget::onKill() { + pa_operation* o; + if (!(o = pa_context_kill_source_output(get_context(), index, NULL, NULL))) { + show_error(_("pa_context_kill_source_output() failed")); + return; + } + + pa_operation_unref(o); +} + +void SourceOutputWidget::clearMenu() { + + while (!sourceMenuItems.empty()) { + std::map::iterator i = sourceMenuItems.begin(); + delete i->second; + sourceMenuItems.erase(i); + } +} + +void SourceOutputWidget::buildMenu() { + for (std::map::iterator i = mainWindow->sourceWidgets.begin(); i != mainWindow->sourceWidgets.end(); ++i) { + SourceMenuItem *m; + sourceMenuItems[i->second->index] = m = new SourceMenuItem(this, i->second->description.c_str(), i->second->index, i->second->index == sourceIndex); + submenu.append(m->menuItem); + } + + menu.show_all(); +} + +void SourceOutputWidget::prepareMenu(void) { + clearMenu(); + buildMenu(); +} + +void SourceOutputWidget::SourceMenuItem::onToggle() { + + if (widget->updating) + return; + + if (!menuItem.get_active()) + return; + + pa_operation* o; + if (!(o = pa_context_move_source_output_by_index(get_context(), widget->index, index, NULL, NULL))) { + show_error(_("pa_context_move_source_output_by_index() failed")); + return; + } + + pa_operation_unref(o); +} diff --git a/src/sourceoutputwidget.h b/src/sourceoutputwidget.h new file mode 100644 index 0000000..cdaf28a --- /dev/null +++ b/src/sourceoutputwidget.h @@ -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 . +***/ + +#ifndef sourceoutputwidget_h +#define sourceoutputwidget_h + +#include "pavucontrol.h" + +#include "minimalstreamwidget.h" + +class MainWindow; + +class SourceOutputWidget : public MinimalStreamWidget { +public: + SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr& x); + static SourceOutputWidget* create(); + virtual ~SourceOutputWidget(); + + SourceOutputType type; + + uint32_t index, clientIndex, sourceIndex; + virtual void onKill(); + + MainWindow *mainWindow; + Gtk::Menu submenu; + Gtk::MenuItem titleMenuItem, killMenuItem; + + struct SourceMenuItem { + SourceMenuItem(SourceOutputWidget *w, const char *label, uint32_t i, bool active) : + widget(w), + menuItem(label), + index(i) { + menuItem.set_active(active); + menuItem.set_draw_as_radio(true); + menuItem.signal_toggled().connect(sigc::mem_fun(*this, &SourceMenuItem::onToggle)); + } + + SourceOutputWidget *widget; + Gtk::CheckMenuItem menuItem; + uint32_t index; + void onToggle(); + }; + + std::map sourceMenuItems; + + void clearMenu(); + void buildMenu(); + virtual void prepareMenu(); +}; + +#endif