ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove method and inline its contents. Nothing gained by wrapping this up

This commit is contained in:
Paul Davis 2018-12-10 16:24:27 -05:00
parent a26e6fed50
commit 154f9825ff
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/ardour_ui.cc
View File

@ -5918,14 +5918,6 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
return true;
}
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 ()
{

1
gtk2_ardour/ardour_ui.h
View File

@ -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 ();

11
gtk2_ardour/ardour_ui_dependents.cc
View File

@ -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 ();