X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_mixer.cc;h=a2669f968d92bf86c4fc94f3a13443ad4efceaa9;hb=0013feddbf260f0b57ee74786c316739806ea47a;hp=0fbc7fe11d2d002a0aaa1e226bafc636d42f927f;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_mixer.cc b/gtk2_ardour/ardour_ui_mixer.cc
index 0fbc7fe11d..a2669f968d 100644
--- a/gtk2_ardour/ardour_ui_mixer.cc
+++ b/gtk2_ardour/ardour_ui_mixer.cc
@@ -23,8 +23,12 @@
    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;
 using namespace PBD;
@@ -34,14 +38,34 @@ ARDOUR_UI::create_mixer ()
 
 {
 	try {
-		mixer = new Mixer_UI ();
+		mixer = Mixer_UI::instance ();
+	}
+
+	catch (failed_constructor& err) {
+		return -1;
+	}
+
+	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;
 	}
 
-	mixer->signal_window_state_event().connect (bind (mem_fun (*this, &ARDOUR_UI::main_window_state_event_handler), false));
+	meterbridge->signal_window_state_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::main_window_state_event_handler), false));
+	meterbridge->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/toggle-meterbridge")));
 
 	return 0;
 }