diff options
author | Colin Guthrie <cguthrie@mandriva.org> | 2009-03-16 17:05:53 +0000 |
---|---|---|
committer | Colin Guthrie <cguthrie@mandriva.org> | 2009-06-17 08:54:10 +0100 |
commit | e509205be255da3779377f12858598755581691b (patch) | |
tree | 435af315e6243a63529f1090aa85a24286a7190f /src | |
parent | 644cfddf390396f7a97ae31034b56959a72ee2c2 (diff) |
Rebase the sink/source widgets on the device widget
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/sinkwidget.cc | 8 | ||||
-rw-r--r-- | src/sinkwidget.h | 4 | ||||
-rw-r--r-- | src/sourcewidget.cc | 8 | ||||
-rw-r--r-- | src/sourcewidget.h | 4 |
5 files changed, 13 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 629219c..7257260 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,6 +28,7 @@ pavucontrol_SOURCES= \ minimalstreamwidget.h minimalstreamwidget.cc \ channelwidget.h channelwidget.cc \ streamwidget.h streamwidget.cc \ + devicewidget.h devicewidget.cc \ cardwidget.h cardwidget.cc \ sinkwidget.h sinkwidget.cc \ sourcewidget.h sourcewidget.cc \ diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc index 8d21bb0..fa90a75 100644 --- a/src/sinkwidget.cc +++ b/src/sinkwidget.cc @@ -27,7 +27,7 @@ #include "i18n.h" SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : - StreamWidget(cobject, x), + DeviceWidget(cobject, x), defaultMenuItem("_Default", true){ add_events(Gdk::BUTTON_PRESS_MASK); @@ -40,8 +40,8 @@ SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade: SinkWidget* SinkWidget::create() { SinkWidget* w; - Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget"); - x->get_widget_derived("streamWidget", w); + Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "deviceWidget"); + x->get_widget_derived("deviceWidget", w); return w; } @@ -57,7 +57,7 @@ void SinkWidget::executeVolumeUpdate() { } void SinkWidget::onMuteToggleButton() { - StreamWidget::onMuteToggleButton(); + DeviceWidget::onMuteToggleButton(); if (updating) return; diff --git a/src/sinkwidget.h b/src/sinkwidget.h index d5ce315..c833e78 100644 --- a/src/sinkwidget.h +++ b/src/sinkwidget.h @@ -23,9 +23,9 @@ #include "pavucontrol.h" -#include "streamwidget.h" +#include "devicewidget.h" -class SinkWidget : public StreamWidget { +class SinkWidget : public DeviceWidget { public: SinkWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); static SinkWidget* create(); diff --git a/src/sourcewidget.cc b/src/sourcewidget.cc index dc13f7f..c77f4f2 100644 --- a/src/sourcewidget.cc +++ b/src/sourcewidget.cc @@ -27,7 +27,7 @@ #include "i18n.h" SourceWidget::SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : - StreamWidget(cobject, x), + DeviceWidget(cobject, x), defaultMenuItem(_("_Default"), true){ add_events(Gdk::BUTTON_PRESS_MASK); @@ -40,8 +40,8 @@ SourceWidget::SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Gl SourceWidget* SourceWidget::create() { SourceWidget* w; - Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget"); - x->get_widget_derived("streamWidget", w); + Glib::RefPtr<Gnome::Glade::Xml> x = Gnome::Glade::Xml::create(GLADE_FILE, "deviceWidget"); + x->get_widget_derived("deviceWidget", w); return w; } @@ -57,7 +57,7 @@ void SourceWidget::executeVolumeUpdate() { } void SourceWidget::onMuteToggleButton() { - StreamWidget::onMuteToggleButton(); + DeviceWidget::onMuteToggleButton(); if (updating) return; diff --git a/src/sourcewidget.h b/src/sourcewidget.h index 2fd137e..04ee4af 100644 --- a/src/sourcewidget.h +++ b/src/sourcewidget.h @@ -23,9 +23,9 @@ #include "pavucontrol.h" -#include "streamwidget.h" +#include "devicewidget.h" -class SourceWidget : public StreamWidget { +class SourceWidget : public DeviceWidget { public: SourceWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x); static SourceWidget* create(); |