Set the mainwindow pointer via an init() method rather than directly via public member variable.

This allows us to perform other general initialisation task (such as setting the tree model on the device combo)

1 files changed, 7 insertions, 2 deletions

diff --git a/src/sinkinputwidget.h b/src/sinkinputwidget.h
index f7b5101..6cb91a8 100644
--- a/src/sinkinputwidget.h
+++ b/src/sinkinputwidget.h
@@ -30,9 +30,11 @@ class MainWindow;
 class SinkInputWidget : public StreamWidget {
 public:
     SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x);
-    static SinkInputWidget* create();
+    static SinkInputWidget* create(MainWindow* mainWindow);
     virtual ~SinkInputWidget();
 
+    void init(MainWindow* mainWindow);
+
     SinkInputType type;
 
     uint32_t index, clientIndex, sinkIndex;
@@ -42,7 +44,6 @@ public:
     virtual void onKill();
     virtual void prepareMenu();
 
-    MainWindow *mainWindow;
     Gtk::Menu submenu;
     Gtk::MenuItem titleMenuItem, killMenuItem;
 
@@ -66,6 +67,10 @@ public:
 
     void clearMenu();
     void buildMenu();
+
+private:
+    MainWindow *mpMainWindow;
+
 };
 
 #endif