summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2018-12-10 16:24:27 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2018-12-10 16:24:27 -0500
commit154f9825ff72d691ba550de573948424b81a09a6 (patch)
tree4c4bb60be9c2f2cce2f98a4cfc175e72bcba4c7a /gtk2_ardour
parenta26e6fed50c1e255dac1eeb4518bab97c647ba99 (diff)
remove method and inline its contents. Nothing gained by wrapping this up
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui.cc8
-rw-r--r--gtk2_ardour/ardour_ui.h1
-rw-r--r--gtk2_ardour/ardour_ui_dependents.cc11
3 files changed, 10 insertions, 10 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index c6fdd4f87a..a522334840 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -5919,14 +5919,6 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
}
void
-ARDOUR_UI::load_bindings ()
-{
- if ((global_bindings = Bindings::get_bindings (X_("Global"))) == 0) {
- error << _("Global keybindings are missing") << endmsg;
- }
-}
-
-void
ARDOUR_UI::cancel_solo ()
{
if (_session) {
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 6e4ea35908..633cdd06a6 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -861,7 +861,6 @@ private:
bool main_window_delete_event (GdkEventAny*);
bool idle_ask_about_quit ();
- void load_bindings ();
bool tabbable_visibility_button_press (GdkEventButton* ev, std::string const& tabbable_name);
void step_up_through_tabs ();
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index ab2c3a9ef8..3578f6f0d5 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -60,12 +60,21 @@ namespace ARDOUR {
}
using namespace ARDOUR;
+using namespace Gtkmm2ext;
void
ARDOUR_UI::we_have_dependents ()
{
install_actions ();
- load_bindings ();
+
+ /* other windows and related key-event-handling contexts have already
+ * called Bindings::get_bindings() to setup their list of keybindings.
+ * Do that here for the global bindings.
+ */
+
+ if ((global_bindings = Bindings::get_bindings (X_("Global"))) == 0) {
+ error << _("Global keybindings are missing") << endmsg;
+ }
ProcessorBox::register_actions ();