allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

remove last of the remnants of "ardour-bindings" strings

Browse Source
This commit is contained in:
Paul Davis
2025-03-19 20:19:08 -06:00
parent 9ef8d99892
commit d07710e847
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/ardour_ui_keys.cc
View File

@@ -83,7 +83,7 @@ ARDOUR_UI::key_event_handler (GdkEventKey* ev, Gtk::Window* event_window)
/* see if it uses the ardour binding system */
if (w) {
bindings = reinterpret_cast<Gtkmm2ext::BindingSet*>(w->get_data ("ardour-bindings"));
bindings = reinterpret_cast<Gtkmm2ext::BindingSet*>(w->get_data (ARDOUR_BINDING_KEY));
}
DEBUG_TRACE (DEBUG::Accelerators, string_compose ("main window key event, bindings = %1, global = %2\n", bindings, &global_bindings));
@@ -94,7 +94,7 @@ ARDOUR_UI::key_event_handler (GdkEventKey* ev, Gtk::Window* event_window)
/* see if window uses ardour binding system */
bindings = reinterpret_cast<Gtkmm2ext::BindingSet*>(window->get_data ("ardour-bindings"));
bindings = reinterpret_cast<Gtkmm2ext::BindingSet*>(window->get_data (ARDOUR_BINDING_KEY));
}
/* An empty binding set is treated as if it doesn't exist */

2
gtk2_ardour/audio_clip_editor.cc
View File

@@ -68,8 +68,6 @@ ClipEditorBox::init ()
Bindings* bindings = Bindings::get_bindings (X_("Clip Editing"));
register_clip_editor_actions (bindings);
//_track_canvas_viewport->canvas()->set_data ("ardour-bindings", midi_bindings);
}
void

4
gtk2_ardour/mixer_ui.cc
View File

@@ -162,7 +162,7 @@ Mixer_UI::Mixer_UI ()
Glib::RefPtr<ToggleAction> fb_act = ActionManager::get_toggle_action ("Mixer", "ToggleFoldbackStrip");
fb_act->set_sensitive (false);
set_widget_bindings (contents(), *bindings, "ardour-bindings");
set_widget_bindings (contents(), *bindings, ARDOUR_BINDING_KEY);
PresentationInfo::Change.connect (*this, invalidator (*this), std::bind (&Mixer_UI::presentation_info_changed, this, _1), gui_context());
Route::FanOut.connect (*this, invalidator (*this), std::bind (&Mixer_UI::fan_out, this, _1, false, true), gui_context());
@@ -494,7 +494,7 @@ Mixer_UI::use_own_window (bool and_fill_it)
win->set_name ("MixerWindow");
ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Mixer"), this);
win->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), win));
set_widget_bindings (*win, *bindings, "ardour-bindings");
set_widget_bindings (*win, *bindings, ARDOUR_BINDING_KEY);
update_title ();
if (!win->get_focus()) {
/* set focus widget to something, anything */

2
gtk2_ardour/step_entry.cc
View File

@@ -90,7 +90,7 @@ StepEntry::StepEntry ()
, program_button (_("+"))
, se (0)
{
set_widget_bindings (*this, *bindings, "ardour-bindings");
set_widget_bindings (*this, *bindings, ARDOUR_BINDING_KEY);
Pango::FontDescription font (ARDOUR_UI_UTILS::sanitized_font ("ArdourSans 24"));
length_1_button.set_layout_font (font);