update CycleTimer to utilize NDEBUG and PBD::DEBUG so that we can leave them in place...

[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 0fbc7fe11d2d002a0aaa1e226bafc636d42f927f..e3250d2a1f552d642463a0f416a4a2cf4944b1fb 100644 (file)
--- a/gtk2_ardour/ardour_ui_mixer.cc
+++ b/gtk2_ardour/ardour_ui_mixer.cc
@@ -25,6 +25,7 @@
 
 #include "ardour_ui.h"
 #include "mixer_ui.h"
+#include "i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -34,14 +35,16 @@ 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 (bind (mem_fun (*this, &ARDOUR_UI::main_window_state_event_handler), false));
+       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;
 }