Remove some debugging code which causes slow flashy screen updates.

[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 68c1edd3e8aaebd24ea485fc5f4447d5e9020ffa..6464c529679bb352fa0d20f27abeaf99210fccde 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -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 exists solely to break compilation dependencies that
@@ -23,17 +22,21 @@
 */
 
 #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;
@@ -44,7 +47,8 @@ void
 ARDOUR_UI::shutdown ()
 {
        if (session) {
-               delete session;
+               /* we're exiting cleanly, so remove any auto-save data */
+               session->remove_pending_capture_state ();
                session = 0;
        }
 
@@ -54,29 +58,41 @@ 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 default bindings */
+       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;
+       }
 
-       KeyboardTarget *defaults = new KeyboardTarget (editor->window(), X_("default"));
+       /* catch changes */
 
-       XMLNode* keynode = ARDOUR::Config->get_keys();
+       GtkAccelMap* accelmap = gtk_accel_map_get();
+       g_signal_connect (accelmap, "changed", (GCallback) accel_map_changed, this);
 
-       if (keynode != 0) {
-               defaults->set_binding_state (*keynode);
-               editor->set_binding_state (*keynode);
-               mixer->set_binding_state (*keynode);
-               meter_bridge->set_binding_state (*keynode);
-       } else {
-               error << _("keyboard_target: error setting binding state: invalid node") << endmsg;
-       }
        
-       /* use the default keyboard target for now */
 
-       keyboard->set_default_target (defaults);
 }
 
 void
@@ -85,20 +101,22 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
        editor->connect_to_session (s);
        mixer->connect_to_session (s);
 
-       meter_bridge->set_session (s);
+       /* its safe to do this now */
+       
+       s->restore_history ("");
 }
 
 void
 ARDOUR_UI::goto_editor_window ()
 {
        editor->show_window ();
-       editor->present();
+       editor->present ();
 }
 void
 ARDOUR_UI::goto_mixer_window ()
 {
        mixer->show_window ();
-       mixer->present();
+       mixer->present ();
 }
 
 gint