radically change Keyboard/Binding API design to disconnect Gtk::Action lookup from...

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index ee239bef087354d251c1f83f634e5c0aa45e9fd5..7cdd7d5b1f489fdd2de48ea9baa47f526ff94dde 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -471,7 +471,7 @@ Editor::Editor ()
        last_event_time.tv_sec = 0;
        last_event_time.tv_usec = 0;
 
-       global_hpacker.set_data ("ardour-bindings", &key_bindings);
+       global_hpacker.set_data ("ardour-bindings", &bindings);
 
        selection_op_history.clear();
        before.clear();
@@ -816,12 +816,12 @@ Editor::Editor ()
 
         /* Button bindings */
 
-        button_bindings = new Bindings;
+       button_bindings = new Bindings ("editor-mouse");
 
        XMLNode* node = button_settings();
         if (node) {
                 for (XMLNodeList::const_iterator i = node->children().begin(); i != node->children().end(); ++i) {
-                        button_bindings->load (**i);
+                        button_bindings->load_operation (**i);
                 }
         }
 
@@ -5862,7 +5862,7 @@ Editor::use_own_window (bool and_fill_it)
 
                // win->signal_realize().connect (*this, &Editor::on_realize);
                win->signal_event().connect (sigc::mem_fun (*this, &Editor::generic_event_handler));
-               win->set_data ("ardour-bindings", &key_bindings);
+               win->set_data ("ardour-bindings", &bindings);
                
                update_title ();
        }