summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui_dependents.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-08-01 23:40:55 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-02-22 15:31:23 -0500
commita13a8da8ac977b247b7c8d8b4f2cfcddfc8996e7 (patch)
tree1634663d824b2249a83d01881924fb3ff5bca2cd /gtk2_ardour/ardour_ui_dependents.cc
parentd0fc12bd22107bf6f14a2c249ed340d40e596f58 (diff)
switch all action registration/binding code over to new API.
This removes the ability to change bindings via menus. Still to come: saving modified bindings, and reworking the key editor
Diffstat (limited to 'gtk2_ardour/ardour_ui_dependents.cc')
-rw-r--r--gtk2_ardour/ardour_ui_dependents.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index ba6ca5373f..c413236e11 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -58,8 +58,10 @@ void
ARDOUR_UI::we_have_dependents ()
{
install_actions ();
+ load_bindings ();
+
ProcessorBox::register_actions ();
- keyboard->setup_keybindings ();
+
editor->setup_tooltips ();
editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
@@ -216,6 +218,8 @@ ARDOUR_UI::setup_windows ()
rc_option_editor = new RCOptionEditor;
rc_option_editor->StateChange.connect (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_state_change));
+ keyboard->setup_keybindings ();
+
if (create_editor ()) {
error << _("UI: cannot setup editor") << endmsg;
return -1;