X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_mixer.cc;h=4f5614e32a0e278ffb9879673833eae5424103e8;hb=4c4061359cb33011e3acab016e8e604cd413a93d;hp=3a1ae4e72518a1ee18a8e77af644609a56ef86a0;hpb=096f146d94b20d8b68a838d2f5151765523869b4;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_mixer.cc b/gtk2_ardour/ardour_ui_mixer.cc
index 3a1ae4e725..4f5614e32a 100644
--- a/gtk2_ardour/ardour_ui_mixer.cc
+++ b/gtk2_ardour/ardour_ui_mixer.cc
@@ -23,8 +23,14 @@
    is to cut down on the nasty compile times for these classes.
 */
 
+#include "gtkmm2ext/keyboard.h"
+
+#include "actions.h"
 #include "ardour_ui.h"
 #include "mixer_ui.h"
+#include "meterbridge.h"
+
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -34,17 +40,32 @@ ARDOUR_UI::create_mixer ()
 
 {
 	try {
-		mixer = new Mixer_UI ();
+		mixer = Mixer_UI::instance ();
+		mixer->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change));
+	}
+
+	catch (failed_constructor& err) {
+		return -1;
+	}
+
+	// mixer->signal_event().connect (sigc::bind (sigc::ptr_fun (&Gtkmm2ext::Keyboard::catch_user_event_for_pre_dialog_focus), mixer));
+
+	return 0;
+}
+
+
+int
+ARDOUR_UI::create_meterbridge ()
+
+{
+	try {
+		meterbridge = Meterbridge::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")));
-	mixer->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/toggle-mixer-on-top")));
-	
 	return 0;
 }