diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-08-08 08:36:29 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
| commit | 67e19c177f473807cd6510751bcf4a48574e6088 (patch) | |
| tree | f44cf815264162afd9d0d4f06c938c4be6cfb06a /gtk2_ardour/step_entry.cc | |
| parent | 29b69b0ab4e92b49e171bfeb68af58da43ae766b (diff) | |
radically change Keyboard/Binding API design to disconnect Gtk::Action lookup from binding definition
We need this because we need binding information/objects before all
Actions have been defined.
Diffstat (limited to 'gtk2_ardour/step_entry.cc')
| -rw-r--r-- | gtk2_ardour/step_entry.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index 979327f946..0ae223ff21 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -498,7 +498,7 @@ StepEntry::on_key_press_event (GdkEventKey* ev) if (!gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) { KeyboardKey k (ev->state, ev->keyval); - if (bindings.activate (k, Bindings::Press)) { + if (bindings->activate (k, Bindings::Press)) { return true; } } @@ -512,7 +512,7 @@ StepEntry::on_key_release_event (GdkEventKey* ev) if (!gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) { KeyboardKey k (ev->state, ev->keyval); - if (bindings.activate (k, Bindings::Release)) { + if (bindings->activate (k, Bindings::Release)) { return true; } } @@ -701,9 +701,9 @@ StepEntry::register_actions () void StepEntry::load_bindings () { - bindings.set_action_map (myactions); - bindings.load (X_("step-editing")); - set_data ("ardour-bindings", &bindings); + bindings = Bindings::get_bindings (X_("step-editing")); + bindings->set_action_map (myactions); + set_data ("ardour-bindings", bindings); } void |