Merge with 2.0-ongoing R3071.

git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 34 deletions

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index a2ac809203..f81dc8d311 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -23,8 +23,6 @@
 
 #include <cstdio>
 
-#include <gtkmm/accelmap.h>
-
 #include <pbd/error.h>
 
 #include "ardour_ui.h"
@@ -33,6 +31,7 @@
 #include "keyboard.h"
 #include "splash.h"
 #include "route_params_ui.h"
+#include "opts.h"
 #include "i18n.h"
 
 using namespace sigc;
@@ -44,6 +43,8 @@ namespace ARDOUR {
 	class Route;
 }
 
+using namespace ARDOUR;
+
 void
 ARDOUR_UI::shutdown ()
 {
@@ -59,52 +60,25 @@ ARDOUR_UI::shutdown ()
 void
 ARDOUR_UI::we_have_dependents ()
 {
-	setup_keybindings ();
-	editor->UpdateAllTransportClocks.connect (mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
-}
-
-static void 
-accel_map_changed (GtkAccelMap* map,
-		   gchar* path,
-		   guint  key,
-		   GdkModifierType mod,
-		   gpointer arg)
-{
-	static_cast<ARDOUR_UI*>(arg)->save_keybindings ();
-}
-
-void
-ARDOUR_UI::setup_keybindings ()
-{
 	install_actions ();
 	ProcessorBox::register_actions ();
-	
-	cerr << "loading bindings from " << keybindings_path << endl;
-
-	try {
-		AccelMap::load (keybindings_path);
-	} catch (...) {
-		error << string_compose (_("Ardour key bindings file not found at \"%1\" or contains errors."), keybindings_path)
-		      << endmsg;
-	}
 
-	/* catch changes */
-
-	GtkAccelMap* accelmap = gtk_accel_map_get();
-	g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed, this);
-
-	
+	Keyboard::setup_keybindings ();
 
+	editor->UpdateAllTransportClocks.connect (mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
 }
 
 void
 ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 {
+	BootMessage (_("Setup Editor"));
 	editor->connect_to_session (s);
+	BootMessage (_("Setup Mixer"));
 	mixer->connect_to_session (s);
 
 	/* its safe to do this now */
 	
+	BootMessage (_("Reload Session History"));
 	s->restore_history ("");
 }