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, 4 insertions, 2 deletions

diff --git a/src/streamwidget.h b/src/streamwidget.h
index c7d68d9..56b95d0 100644
--- a/src/streamwidget.h
+++ b/src/streamwidget.h
@@ -45,9 +45,9 @@ public:
 
     ChannelWidget *channelWidgets[PA_CHANNELS_MAX];
 
-    virtual void onKill();
-    virtual void onDeviceChange() = 0;
     virtual void onMuteToggleButton();
+    virtual void onDeviceChange() = 0;
+    virtual void onKill();
 
     sigc::connection timeoutConnection;
 
@@ -59,6 +59,8 @@ public:
 
 protected:
   Gtk::ComboBox *deviceCombo;
+
+  bool mSuppressDeviceChange;
 };
 
 #endif