A couple GUI tweaks - minor toolbar reorganization, trying to get the width down...

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index f2b41bd47a4d39ab3caef2acb2f8dcac8e711b24..0603fc6baa5acb95ee365736ac18eb2be21734c1 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -23,17 +23,20 @@
 */
 
 #include <cstdio>
+
+#include <gtkmm/accelmap.h>
+
 #include <pbd/error.h>
 #include "ardour_ui.h"
 #include "public_editor.h"
 #include "mixer_ui.h"
-#include "meter_bridge.h"
 #include "keyboard.h"
 #include "route_params_ui.h"
 #include "i18n.h"
 
 using namespace sigc;
-
+using namespace Gtk;
+using namespace PBD;
 
 namespace ARDOUR {
        class Session;
@@ -59,8 +62,16 @@ ARDOUR_UI::we_have_dependents ()
 void
 ARDOUR_UI::setup_keybindings ()
 {
-       // GTK2FIX
-       editor->register_actions ();
+       install_actions ();
+       RedirectBox::register_actions ();
+       
+       std::string key_binding_file = ARDOUR::find_config_file("ardour.bindings");
+
+       try {
+               AccelMap::load (key_binding_file);
+       } catch (...) {
+               error << "ardour key bindings file not found" << endmsg;
+       }
 }
 
 void
@@ -68,8 +79,6 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 {
        editor->connect_to_session (s);
        mixer->connect_to_session (s);
-
-       meter_bridge->set_session (s);
 }
 
 void