Wire up all the new UI code.

This makes the default button work on sinks/sources, allows the drop
down to actually change the sink/source and removes the old menu code.

Some names and such are fixed in the glade file too.

1 files changed, 0 insertions, 26 deletions

diff --git a/src/sourceoutputwidget.h b/src/sourceoutputwidget.h
index 46df6e1..0d43cc9 100644
--- a/src/sourceoutputwidget.h
+++ b/src/sourceoutputwidget.h
@@ -31,7 +31,6 @@ class SourceOutputWidget : public StreamWidget {
 public:
     SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x);
     static SourceOutputWidget* create(MainWindow* mainWindow);
-    virtual ~SourceOutputWidget();
 
     void init(MainWindow* mainWindow);
 
@@ -43,31 +42,6 @@ public:
     virtual void onDeviceChange();
     virtual void onKill();
 
-    Gtk::Menu submenu;
-    Gtk::MenuItem titleMenuItem;
-
-    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<uint32_t, SourceMenuItem*> sourceMenuItems;
-
-    void clearMenu();
-    void buildMenu();
-    virtual void prepareMenu();
-
 private:
     MainWindow *mpMainWindow;
     uint32_t mSourceIndex;