Remove ardour_ui.h header inclusion

[ardour.git] / gtk2_ardour / ardour_ui_mixer.cc

diff --git a/gtk2_ardour/ardour_ui_mixer.cc b/gtk2_ardour/ardour_ui_mixer.cc
index 2604e8215b98279c0d9b8ff1fec804397a36bfef..56ecc057f0b3155df7076dfb498ce4c6ec096f36 100644 (file)
--- a/gtk2_ardour/ardour_ui_mixer.cc
+++ b/gtk2_ardour/ardour_ui_mixer.cc
@@ -26,6 +26,7 @@
 #include "actions.h"
 #include "ardour_ui.h"
 #include "mixer_ui.h"
+#include "meterbridge.h"
 
 #include "i18n.h"
 
@@ -45,7 +46,24 @@ ARDOUR_UI::create_mixer ()
        }
 
        mixer->signal_window_state_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::main_window_state_event_handler), false));
-       mixer->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/toggle-mixer")));
+
+       return 0;
+}
+
+
+int
+ARDOUR_UI::create_meterbridge ()
+
+{
+       try {
+               meterbridge = Meterbridge::instance ();
+       }
+
+       catch (failed_constructor& err) {
+               return -1;
+       }
+
+       meterbridge->signal_window_state_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::main_window_state_event_handler), false));
 
        return 0;
 }