diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-08-10 14:31:59 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
| commit | 949163f80610af76edc2c1878dfb00bae2de316a (patch) | |
| tree | ce5c0e8c5c5e4f3eb37fd57d37931222c2d5d521 /gtk2_ardour/ardour_ui.cc | |
| parent | 67e19c177f473807cd6510751bcf4a48574e6088 (diff) | |
more changes to Bindings, Keyboard APIs
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index fa9331d886..8f05f60777 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -238,7 +238,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) , secondary_clock (new MainClock (X_("secondary"), X_("secondary"), false)) , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false)) , video_timeline(0) - , global_bindings (0) , ignore_dual_punch (false) , editor (0) , mixer (0) @@ -614,8 +613,6 @@ ARDOUR_UI::post_engine () exit (0); } - Bindings::associate_all (); - /* this being a GUI and all, we want peakfiles */ AudioFileSource::set_build_peakfiles (true); @@ -5179,8 +5176,6 @@ ARDOUR_UI::key_event_handler (GdkEventKey* ev, Gtk::Window* event_window) if (w) { bindings = reinterpret_cast<Gtkmm2ext::Bindings*>(w->get_data ("ardour-bindings")); - } else { - bindings = global_bindings; } DEBUG_TRACE (DEBUG::Accelerators, string_compose ("main window key event, bindings = %1, global = %2\n", bindings, &global_bindings)); @@ -5192,7 +5187,6 @@ ARDOUR_UI::key_event_handler (GdkEventKey* ev, Gtk::Window* event_window) /* see if window uses ardour binding system */ bindings = reinterpret_cast<Gtkmm2ext::Bindings*>(window->get_data ("ardour-bindings")); - } /* An empty binding set is treated as if it doesn't exist */ @@ -5286,7 +5280,7 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey if (bindings) { - DEBUG_TRACE (DEBUG::Accelerators, "\tusing Ardour bindings for this window\n"); + DEBUG_TRACE (DEBUG::Accelerators, string_compose ("\tusing Ardour bindings %1 for this event\n", bindings)); if (bindings->activate (k, Bindings::Press)) { DEBUG_TRACE (DEBUG::Accelerators, "\t\thandled\n"); @@ -5349,7 +5343,7 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey void ARDOUR_UI::load_bindings () { - if ((global_bindings = Bindings::get_bindings ("global")) == 0) { + if ((global_bindings = Bindings::get_bindings ("global", global_actions)) == 0) { error << _("Global keybindings are missing") << endmsg; } } |