enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[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 2604e8215b98279c0d9b8ff1fec804397a36bfef..4f5614e32a0e278ffb9879673833eae5424103e8 100644 (file)
--- a/gtk2_ardour/ardour_ui_mixer.cc
+++ b/gtk2_ardour/ardour_ui_mixer.cc
@@ -23,11 +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 "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -38,14 +41,30 @@ ARDOUR_UI::create_mixer ()
 {
        try {
                mixer = Mixer_UI::instance ();
+               mixer->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change));
        }
 
        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_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;
+       }
 
        return 0;
 }