X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_mixer.cc;h=e3250d2a1f552d642463a0f416a4a2cf4944b1fb;hb=51138ef75b4c59ea5a0c35c23906a093c1e34b2c;hp=991f37c3a7a2cb4669bf1ec842049f638d824a78;hpb=fe13d08874f08b723df53116e5655c3d229a657e;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_mixer.cc b/gtk2_ardour/ardour_ui_mixer.cc
index 991f37c3a7..e3250d2a1f 100644
--- a/gtk2_ardour/ardour_ui_mixer.cc
+++ b/gtk2_ardour/ardour_ui_mixer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 /* This file contains any ARDOUR_UI methods that require knowledge of
@@ -26,6 +25,7 @@
 
 #include "ardour_ui.h"
 #include "mixer_ui.h"
+#include "i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -35,12 +35,17 @@ ARDOUR_UI::create_mixer ()
 
 {
 	try {
-		mixer = new Mixer_UI (*engine);
-	} 
+		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")));
+	mixer->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/toggle-mixer-on-top")));
+
 	return 0;
 }
+