From 9ce0e0a380a2d6fd99c02b4b2c0aa29a63e728f8 Mon Sep 17 00:00:00 2001 From: Rafał Mużyło Date: Thu, 3 Mar 2011 14:31:14 +0000 Subject: Drop the need to use libglademm --- configure.ac | 2 +- src/cardwidget.cc | 4 +- src/cardwidget.h | 2 +- src/channelwidget.cc | 6 +- src/channelwidget.h | 2 +- src/devicewidget.cc | 4 +- src/devicewidget.h | 2 +- src/mainwindow.cc | 9 +- src/mainwindow.h | 2 +- src/minimalstreamwidget.cc | 2 +- src/minimalstreamwidget.h | 2 +- src/pavucontrol.glade | 1485 ++++++++++++++++++++++++++------------------ src/pavucontrol.h | 1 - src/rolewidget.cc | 4 +- src/rolewidget.h | 2 +- src/sinkinputwidget.cc | 4 +- src/sinkinputwidget.h | 2 +- src/sinkwidget.cc | 4 +- src/sinkwidget.h | 2 +- src/sourceoutputwidget.cc | 4 +- src/sourceoutputwidget.h | 2 +- src/sourcewidget.cc | 4 +- src/sourcewidget.h | 2 +- src/streamwidget.cc | 2 +- src/streamwidget.h | 2 +- 25 files changed, 906 insertions(+), 651 deletions(-) diff --git a/configure.ac b/configure.ac index 96613ba..beb33f3 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ AC_PROG_LN_S AC_TYPE_SIGNAL AC_HEADER_STDC -PKG_CHECK_MODULES(GUILIBS, [ gtkmm-2.4 >= 2.16 libglademm-2.4 sigc++-2.0 libcanberra-gtk >= 0.16 ]) +PKG_CHECK_MODULES(GUILIBS, [ gtkmm-2.4 >= 2.16 sigc++-2.0 libcanberra-gtk >= 0.16 ]) AC_SUBST(GUILIBS_CFLAGS) AC_SUBST(GUILIBS_LIBS) diff --git a/src/cardwidget.cc b/src/cardwidget.cc index c8efd31..c79ac6c 100644 --- a/src/cardwidget.cc +++ b/src/cardwidget.cc @@ -27,7 +27,7 @@ #include "i18n.h" /*** CardWidget ***/ -CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : +CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : Gtk::VBox(cobject) { x->get_widget("nameLabel", nameLabel); @@ -43,7 +43,7 @@ CardWidget::CardWidget(BaseObjectType* cobject, const Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "cardWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "cardWidget"); x->get_widget_derived("cardWidget", w); return w; } diff --git a/src/cardwidget.h b/src/cardwidget.h index ca90273..3837d5b 100644 --- a/src/cardwidget.h +++ b/src/cardwidget.h @@ -25,7 +25,7 @@ class CardWidget : public Gtk::VBox { public: - CardWidget(BaseObjectType* cobject, const Glib::RefPtr& x); + CardWidget(BaseObjectType* cobject, const Glib::RefPtr& x); static CardWidget* create(); Gtk::Label *nameLabel; diff --git a/src/channelwidget.cc b/src/channelwidget.cc index bcfcd82..21f3afa 100644 --- a/src/channelwidget.cc +++ b/src/channelwidget.cc @@ -31,7 +31,7 @@ static bool show_decibel = true; /*** ChannelWidget ***/ -ChannelWidget::ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : +ChannelWidget::ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : Gtk::EventBox(cobject), volumeScaleEnabled(true) { @@ -47,7 +47,9 @@ ChannelWidget::ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "channelWidget"); + Glib::RefPtr x = Gtk::Builder::create(); + x->add_from_file(GLADE_FILE, "adjustment1"); + x->add_from_file(GLADE_FILE, "channelWidget"); x->get_widget_derived("channelWidget", w); return w; } diff --git a/src/channelwidget.h b/src/channelwidget.h index b15fe84..26a880c 100644 --- a/src/channelwidget.h +++ b/src/channelwidget.h @@ -27,7 +27,7 @@ class MinimalStreamWidget; class ChannelWidget : public Gtk::EventBox { public: - ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr& x); + ChannelWidget(BaseObjectType* cobject, const Glib::RefPtr& x); static ChannelWidget* create(); void setVolume(pa_volume_t volume); diff --git a/src/devicewidget.cc b/src/devicewidget.cc index 0798e42..9a75970 100644 --- a/src/devicewidget.cc +++ b/src/devicewidget.cc @@ -31,7 +31,7 @@ #include "i18n.h" /*** DeviceWidget ***/ -DeviceWidget::DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : +DeviceWidget::DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : MinimalStreamWidget(cobject, x) { x->get_widget("lockToggleButton", lockToggleButton); @@ -197,7 +197,7 @@ void DeviceWidget::renamePopup() { Gtk::Dialog* dialog; Gtk::Entry* renameText; - Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "renameDialog"); + Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "renameDialog"); x->get_widget("renameDialog", dialog); x->get_widget("renameText", renameText); diff --git a/src/devicewidget.h b/src/devicewidget.h index 3170f04..358c708 100644 --- a/src/devicewidget.h +++ b/src/devicewidget.h @@ -30,7 +30,7 @@ class ChannelWidget; class DeviceWidget : public MinimalStreamWidget { public: - DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr& x); + DeviceWidget(BaseObjectType* cobject, const Glib::RefPtr& x); void init(MainWindow* mainWindow, Glib::ustring); void setChannelMap(const pa_channel_map &m, bool can_decibel); diff --git a/src/mainwindow.cc b/src/mainwindow.cc index 60137b6..119e30e 100644 --- a/src/mainwindow.cc +++ b/src/mainwindow.cc @@ -66,7 +66,7 @@ struct source_port_prio_compare { } }; -MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr& x) : +MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr& x) : Gtk::Window(cobject), showSinkInputType(SINK_INPUT_CLIENT), showSinkType(SINK_ALL), @@ -139,7 +139,12 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "mainWindow"); + Glib::RefPtr x = Gtk::Builder::create(); + x->add_from_file(GLADE_FILE, "liststore1"); + x->add_from_file(GLADE_FILE, "liststore2"); + x->add_from_file(GLADE_FILE, "liststore3"); + x->add_from_file(GLADE_FILE, "liststore4"); + x->add_from_file(GLADE_FILE, "mainWindow"); x->get_widget_derived("mainWindow", w); return w; } diff --git a/src/mainwindow.h b/src/mainwindow.h index a1e56f0..87a0898 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -34,7 +34,7 @@ class RoleWidget; class MainWindow : public Gtk::Window { public: - MainWindow(BaseObjectType* cobject, const Glib::RefPtr& x); + MainWindow(BaseObjectType* cobject, const Glib::RefPtr& x); static MainWindow* create(); virtual ~MainWindow(); diff --git a/src/minimalstreamwidget.cc b/src/minimalstreamwidget.cc index ac665de..562739d 100644 --- a/src/minimalstreamwidget.cc +++ b/src/minimalstreamwidget.cc @@ -25,7 +25,7 @@ #include "minimalstreamwidget.h" /*** MinimalStreamWidget ***/ -MinimalStreamWidget::MinimalStreamWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : +MinimalStreamWidget::MinimalStreamWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : Gtk::VBox(cobject), peakProgressBar(), lastPeak(0), diff --git a/src/minimalstreamwidget.h b/src/minimalstreamwidget.h index ba7eb1d..7d5ee24 100644 --- a/src/minimalstreamwidget.h +++ b/src/minimalstreamwidget.h @@ -25,7 +25,7 @@ class MinimalStreamWidget : public Gtk::VBox { public: - MinimalStreamWidget(BaseObjectType* cobject, const Glib::RefPtr& x); + MinimalStreamWidget(BaseObjectType* cobject, const Glib::RefPtr& x); Gtk::VBox *channelsVBox; Gtk::Label *nameLabel, *boldNameLabel; diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade index 82aca34..f120b95 100644 --- a/src/pavucontrol.glade +++ b/src/pavucontrol.glade @@ -1,772 +1,1275 @@ - - - + + + - + + 100 + 44.2408370972 + 5 + + + True + False + window1 + + + True + False + + + True + False + + + True + False + 12 + 6 + + + True + False + 6 + + + True + False + 0 + gtk-missing-image + + + False + True + 0 + + + + + True + False + + + True + False + 0 + Card Name + True + middle + + + True + True + 0 + + + + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + <b>Profile:</b> + True + + + False + True + 0 + + + + + True + False + + + True + True + 1 + + + + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + + + False + False + 1 + + + + + + + + + True + False + window2 + + + True + False + 6 + + + True + False + 0 + <b>left-front</b> + True + 15 + + + False + False + 0 + + + + + True + True + adjustment1 + 0 + False + + + True + True + 1 + + + + + True + False + 1 + 50% + 9 + + + False + False + 2 + + + + + + + True + False + window1 + + + True + False + + + True + False + + + True + False + 12 + 6 + + + True + False + 6 + + + True + False + gtk-missing-image + + + False + True + 0 + + + + + True + False + + + True + False + True + middle + + + False + True + 0 + + + + + True + False + 0 + Stream Title + True + middle + + + True + True + 1 + + + + + True + True + 1 + + + + + True + False + 3 + + + True + True + False + Mute audio + False + none + + + True + False + audio-volume-muted + 1 + + + + + False + False + 0 + + + + + True + True + False + Lock channels together + False + none + True + + + True + False + stock_lock + 1 + + + + + False + False + 1 + + + + + True + True + False + Set as fallback + False + + + True + False + emblem-default + + + + + False + False + 2 + + + + + False + True + 2 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + <b>Port:</b> + True + + + False + True + 0 + + + + + True + False + + + True + True + 1 + + + + + True + True + 1 + + + + + True + False + 6 + + + + + + + + + False + False + 2 + + + + + False + False + 0 + + + + + True + False + + + False + False + 1 + + + + + + + + + + + + + + + All Streams + + + Applications + + + Virtual Streams + + + + + + + + + + + All Streams + + + Applications + + + Virtual Streams + + + + + + + + + + + All Output Devices + + + Hardware Output Devices + + + Virtual Output Devices + + + + + + + + + + + All Input Devices + + + All Except Monitors + + + Hardware Input Devices + + + Virtual Input Devices + + + Monitors + + + + + False Volume Control 500 400 multimedia-volume-control - + True + False 12 - vertical 12 - + True True False - + True - vertical + False - + True True 12 never automatic - + True + False none - + True - vertical + False - + True False + False 16 16 <i>No application is currently playing audio.</i> True - + + True + True 0 - + - + - + + True + True 0 - + True + False 12 12 12 - + True + False 6 - + True + False 1 <b>_Show:</b> True True - + + True + True 0 - + True - All Streams -Applications -Virtual Streams - + False + liststore1 + + + + 0 + + + False + True 1 - + - + False False 1 - + - - + + True + False _Playback True - + False - tab - + True - vertical + False - + True True 12 never automatic - + True + False none - + True - vertical + False - + True False + False 16 16 <i>No application is currently recording audio.</i> True - + + True + True 0 - + - + - + + True + True 0 - + True + False 12 12 12 - + True + False 6 - + True + False 1 <b>_Show:</b> True True - + + True + True 0 - + True - All Streams -Applications -Virtual Streams - + False + liststore2 + + + + 0 + + + False + True 1 - + - + False False 1 - + 1 - - + + True + False _Recording True - + 1 False - tab - + True - vertical + False - + True True 12 never automatic - + True + False none - + True - vertical + False - + True False + False 16 16 <i>No output devices available</i> True - + + True + True 0 - + - + - + + True + True 0 - + True + False 12 12 12 - + True + False 6 - + True + False 1 <b>S_how:</b> True True sinkTypeComboBox - + + True + True 0 - + True - All Output Devices -Hardware Output Devices -Virtual Output Devices - + False + liststore3 + + + + 0 + + + False + True 1 - + - + False + True 1 - + 2 - - + + True + False _Output Devices True - + 2 False - tab - + True - vertical + False - + True True 12 never automatic - + True + False queue none - + True - vertical + False - + True False + False 16 16 <i>No input devices available</i> True - + + True + True 0 - + - + - + + True + True 0 - + True + False 12 12 12 - + True + False 6 - + True + False 1 <b>Sho_w:</b> True True sourceTypeComboBox - + + True + True 0 - + True - All Input Devices -All Except Monitors -Hardware Input Devices -Virtual Input Devices -Monitors - + False + liststore4 + + + + 0 + + + False + True 1 - + - + False + True 1 - + 3 - - + + True + False _Input Devices True - + 3 False - tab - + True - vertical + False - + True True 12 never automatic - + True + False none - + True - vertical + False - + True False + False 16 16 <i>No cards available for configuration</i> True - + + True + True 0 - + - + - + + True + True 0 - + 4 - - + + True + False _Configuration True - + 4 False - tab - + + True + True 0 - + + False <i>Establishing connection to PulseAudio. Please wait...</i> True - + + True + True 1 - + - - - True - window1 - - + + + False + 5 + normal + + True - - + False + 2 + + True - vertical - - - True - 12 - vertical - 6 - - - True - 6 - - - True - gtk-missing-image - - - False - 0 - - - - - True - 2 - - - True - True - middle - - - False - 0 - - - - - True - 0 - Stream Title - True - middle - - - False - 1 - - - - - True - 0 - 4 - direction - True - - - False - 2 - - - - - Device - True - True - True - half - 0 - - - False - end - 3 - - - - - 1 - - - - - True - 3 - - - True - True - False - Mute audio - none - - - True - audio-volume-muted - 1 - - - - - False - False - 0 - - - - - True - True - False - Lock channels together - none - True - - - True - stock_lock - 1 - - - - - False - False - 1 - - - - - False - 2 - - - - - False - False - 0 - - - - - True - vertical - 6 - - - - - - - - - False - False - 1 - - - - - False - False - 0 - + False + end + + - - True - - - False - False - 1 - + - + + + False + True + end + 0 + + + + + True + False + 0 + <b>Rename device to:</b> + True + + + True + True + 1 + + + + + True + True + ● + True + 60 + False + False + True + True + + + True + True + 2 + - + - - + + True + False window1 - + True + False - + True - vertical + False - + True + False 12 - vertical 6 - + True + False 6 - + True + False gtk-missing-image - + False + True 0 - + True + False + 2 - + True + False True middle - + False + True 0 - + True + False 0 Stream Title True middle - + + False + True 1 - + + + True + False + 0 + 4 + direction + True + + + False + True + 2 + + + + + Device + True + True + True + False + half + 0 + + + False + True + end + 3 + + + + True + True 1 - + True + False 3 - + True True False - Mute audio + Mute audio + False none - + True + False audio-volume-muted 1 - + - + False False @@ -774,53 +1277,37 @@ Monitors - + True True False - Lock channels together + Lock channels together + False none True - + True + False stock_lock 1 - + - + False False 1 - - - True - True - False - Set as fallback - - - True - emblem-default - - - - - False - False - 2 - - - + False + True 2 - + False False @@ -828,38 +1315,9 @@ Monitors - - True - 6 - - - True - 0 - <b>Port:</b> - True - - - False - 0 - - - - - True - - - 1 - - - - - 1 - - - - + True - vertical + False 6 @@ -867,172 +1325,14 @@ Monitors - - - False - False - 2 - - - - - False - False - 0 - - - - - True - - - False - False - 1 - - - - - - - - - True - window2 - - - True - 6 - - - True - 0 - <b>left-front</b> - True - 15 - - - False - False - 0 - - - - - True - True - 44.2408370972 0 100 5 0 0 - 0 - False - - - 1 - - - - - True - 1 - 50% - 9 - - - False - False - 2 - - - - - - - True - window1 - - - True - - - True - vertical - - - True - 12 - vertical - 6 - - - True - 6 - - - True - 0 - gtk-missing-image - - - False - 0 - - - - - True - - - True - 0 - Card Name - True - middle - - - 0 - - - - - 1 - - - + False False - 0 - - - - - True - 6 - - - True - 0 - <b>Profile:</b> - True - - - False - 0 - - - - - True - - - 1 - - - - 1 - + False False @@ -1040,70 +1340,19 @@ Monitors - + True - + False + False False 1 - - - - - - - 5 - normal - False - - - True - vertical - 2 - - - True - 0 - <b>Rename device to:</b> - True - - - 1 - - - - - True - True - ● - True - 60 - - - 2 - - - - - True - end - - - - - - - - - False - end - 0 - + - + - - + + diff --git a/src/pavucontrol.h b/src/pavucontrol.h index 0e0f6bd..4e3d32e 100644 --- a/src/pavucontrol.h +++ b/src/pavucontrol.h @@ -27,7 +27,6 @@ #include #include -#include #include diff --git a/src/rolewidget.cc b/src/rolewidget.cc index 31be005..fd3196c 100644 --- a/src/rolewidget.cc +++ b/src/rolewidget.cc @@ -28,7 +28,7 @@ #include "i18n.h" -RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : +RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : StreamWidget(cobject, x) { lockToggleButton->hide(); @@ -38,7 +38,7 @@ RoleWidget::RoleWidget(BaseObjectType* cobject, const Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget"); x->get_widget_derived("streamWidget", w); return w; } diff --git a/src/rolewidget.h b/src/rolewidget.h index c7b198c..1d008f2 100644 --- a/src/rolewidget.h +++ b/src/rolewidget.h @@ -27,7 +27,7 @@ class RoleWidget : public StreamWidget { public: - RoleWidget(BaseObjectType* cobject, const Glib::RefPtr& x); + RoleWidget(BaseObjectType* cobject, const Glib::RefPtr& x); static RoleWidget* create(); Glib::ustring role; diff --git a/src/sinkinputwidget.cc b/src/sinkinputwidget.cc index 76d865f..b88b718 100644 --- a/src/sinkinputwidget.cc +++ b/src/sinkinputwidget.cc @@ -28,7 +28,7 @@ #include "i18n.h" -SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : +SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : StreamWidget(cobject, x) { gchar *txt; @@ -40,7 +40,7 @@ SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget"); x->get_widget_derived("streamWidget", w); w->init(mainWindow); return w; diff --git a/src/sinkinputwidget.h b/src/sinkinputwidget.h index 11893ff..de3ecb8 100644 --- a/src/sinkinputwidget.h +++ b/src/sinkinputwidget.h @@ -29,7 +29,7 @@ class MainWindow; class SinkInputWidget : public StreamWidget { public: - SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr& x); + SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr& x); static SinkInputWidget* create(MainWindow* mainWindow); ~SinkInputWidget(void); diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc index 3196dc7..c797e68 100644 --- a/src/sinkwidget.cc +++ b/src/sinkwidget.cc @@ -28,13 +28,13 @@ #include "i18n.h" -SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : +SinkWidget::SinkWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : DeviceWidget(cobject, x) { } SinkWidget* SinkWidget::create(MainWindow* mainWindow) { SinkWidget* w; - Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "deviceWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget"); x->get_widget_derived("deviceWidget", w); w->init(mainWindow, "sink"); return w; diff --git a/src/sinkwidget.h b/src/sinkwidget.h index 84f0d4a..3fbd7aa 100644 --- a/src/sinkwidget.h +++ b/src/sinkwidget.h @@ -27,7 +27,7 @@ class SinkWidget : public DeviceWidget { public: - SinkWidget(BaseObjectType* cobject, const Glib::RefPtr& x); + SinkWidget(BaseObjectType* cobject, const Glib::RefPtr& x); static SinkWidget* create(MainWindow* mainWindow); SinkType type; diff --git a/src/sourceoutputwidget.cc b/src/sourceoutputwidget.cc index 7064b38..ce1cbb6 100644 --- a/src/sourceoutputwidget.cc +++ b/src/sourceoutputwidget.cc @@ -28,7 +28,7 @@ #include "i18n.h" -SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : +SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : StreamWidget(cobject, x) { gchar *txt; @@ -44,7 +44,7 @@ SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefP SourceOutputWidget* SourceOutputWidget::create(MainWindow* mainWindow) { SourceOutputWidget* w; - Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "streamWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget"); x->get_widget_derived("streamWidget", w); w->init(mainWindow); return w; diff --git a/src/sourceoutputwidget.h b/src/sourceoutputwidget.h index 0b88d06..e9b0dce 100644 --- a/src/sourceoutputwidget.h +++ b/src/sourceoutputwidget.h @@ -29,7 +29,7 @@ class MainWindow; class SourceOutputWidget : public StreamWidget { public: - SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr& x); + SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr& x); static SourceOutputWidget* create(MainWindow* mainWindow); ~SourceOutputWidget(void); diff --git a/src/sourcewidget.cc b/src/sourcewidget.cc index 29980cc..5e4ecf0 100644 --- a/src/sourcewidget.cc +++ b/src/sourcewidget.cc @@ -26,13 +26,13 @@ #include "i18n.h" -SourceWidget::SourceWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : +SourceWidget::SourceWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : DeviceWidget(cobject, x) { } SourceWidget* SourceWidget::create(MainWindow* mainWindow) { SourceWidget* w; - Glib::RefPtr x = Gnome::Glade::Xml::create(GLADE_FILE, "deviceWidget"); + Glib::RefPtr x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget"); x->get_widget_derived("deviceWidget", w); w->init(mainWindow, "source"); return w; diff --git a/src/sourcewidget.h b/src/sourcewidget.h index 9a2cca3..ebd92e3 100644 --- a/src/sourcewidget.h +++ b/src/sourcewidget.h @@ -27,7 +27,7 @@ class SourceWidget : public DeviceWidget { public: - SourceWidget(BaseObjectType* cobject, const Glib::RefPtr& x); + SourceWidget(BaseObjectType* cobject, const Glib::RefPtr& x); static SourceWidget* create(MainWindow* mainWindow); SourceType type; diff --git a/src/streamwidget.cc b/src/streamwidget.cc index c4ad15f..431e460 100644 --- a/src/streamwidget.cc +++ b/src/streamwidget.cc @@ -29,7 +29,7 @@ #include "i18n.h" /*** StreamWidget ***/ -StreamWidget::StreamWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : +StreamWidget::StreamWidget(BaseObjectType* cobject, const Glib::RefPtr& x) : MinimalStreamWidget(cobject, x), peak(NULL), mpMainWindow(NULL) { diff --git a/src/streamwidget.h b/src/streamwidget.h index 28a2a47..b797ec5 100644 --- a/src/streamwidget.h +++ b/src/streamwidget.h @@ -30,7 +30,7 @@ class ChannelWidget; class StreamWidget : public MinimalStreamWidget { public: - StreamWidget(BaseObjectType* cobject, const Glib::RefPtr& x); + StreamWidget(BaseObjectType* cobject, const Glib::RefPtr& x); void init(MainWindow* mainWindow); void setChannelMap(const pa_channel_map &m, bool can_decibel); -- cgit