X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_mixer.cc;h=56ecc057f0b3155df7076dfb498ce4c6ec096f36;hb=4a10dbbc1b1fc0de33a125dcc1f6d74c592ff3f7;hp=e3250d2a1f552d642463a0f416a4a2cf4944b1fb;hpb=e2757229a74a17a76682b6c72868d8e4822b7678;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_mixer.cc b/gtk2_ardour/ardour_ui_mixer.cc
index e3250d2a1f..56ecc057f0 100644
--- a/gtk2_ardour/ardour_ui_mixer.cc
+++ b/gtk2_ardour/ardour_ui_mixer.cc
@@ -23,8 +23,11 @@
    is to cut down on the nasty compile times for these classes.
 */
 
+#include "actions.h"
 #include "ardour_ui.h"
 #include "mixer_ui.h"
+#include "meterbridge.h"
+
 #include "i18n.h"
 
 using namespace ARDOUR;
@@ -43,8 +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")));
-	mixer->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/toggle-mixer-on-top")));
+
+	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;
 }