From 75ae0fd4b1e523270757d762cd5623b5d2adec6f Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 26 Sep 2022 15:48:30 -0500 Subject: [PATCH] disambiguate trigger functions: cue_bang -> trigger_cue_row --- gtk2_ardour/cuebox_ui.cc | 6 +++--- gtk2_ardour/cuebox_ui.h | 2 +- gtk2_ardour/trigger_ui.cc | 6 +++--- gtk2_ardour/trigger_ui.h | 2 +- libs/ardour/ardour/session.h | 2 +- libs/ardour/session_process.cc | 2 +- libs/surfaces/control_protocol/basic_ui.cc | 4 ++-- libs/surfaces/control_protocol/control_protocol/basic_ui.h | 2 +- libs/surfaces/osc/osc.cc | 2 +- libs/surfaces/osc/osc.h | 2 +- libs/surfaces/push2/cues.cc | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gtk2_ardour/cuebox_ui.cc b/gtk2_ardour/cuebox_ui.cc index e6c233529e..a49fb6e2f6 100644 --- a/gtk2_ardour/cuebox_ui.cc +++ b/gtk2_ardour/cuebox_ui.cc @@ -387,9 +387,9 @@ CueBoxUI::set_all_quantization (Temporal::BBT_Offset const& q, uint64_t idx) } void -CueBoxUI::trigger_cue (uint64_t n) +CueBoxUI::trigger_cue_row (uint64_t n) { - _session->cue_bang (n); + _session->trigger_cue_row (n); } void @@ -439,7 +439,7 @@ CueBoxUI::event (GdkEvent* ev, uint64_t n) switch (ev->type) { case GDK_BUTTON_PRESS: if (ev->button.button==1) { - trigger_cue (n); + trigger_cue_row (n); } break; case GDK_2BUTTON_PRESS: diff --git a/gtk2_ardour/cuebox_ui.h b/gtk2_ardour/cuebox_ui.h index a86a7a8c70..2cb17babd5 100644 --- a/gtk2_ardour/cuebox_ui.h +++ b/gtk2_ardour/cuebox_ui.h @@ -76,7 +76,7 @@ public: CueBoxUI (ArdourCanvas::Item* parent); ~CueBoxUI (); - void trigger_cue (uint64_t n); + void trigger_cue_row (uint64_t n); void _size_allocate (ArdourCanvas::Rect const&); diff --git a/gtk2_ardour/trigger_ui.cc b/gtk2_ardour/trigger_ui.cc index 3b682cd1b3..c4b06cb69d 100644 --- a/gtk2_ardour/trigger_ui.cc +++ b/gtk2_ardour/trigger_ui.cc @@ -163,17 +163,17 @@ TriggerUI::register_actions () const std::string action_name = string_compose ("trigger-cue-%1", n); const std::string display_name = string_compose (_("Trigger Cue %1"), cue_marker_name (n)); - ActionManager::register_action (trigger_actions, action_name.c_str (), display_name.c_str (), sigc::bind (sigc::ptr_fun (TriggerUI::trigger_cue), n)); + ActionManager::register_action (trigger_actions, action_name.c_str (), display_name.c_str (), sigc::bind (sigc::ptr_fun (TriggerUI::trigger_cue_row), n)); } } void -TriggerUI::trigger_cue (int32_t n) +TriggerUI::trigger_cue_row (int32_t n) { Session* s = AudioEngine::instance()->session(); if (s) { - s->cue_bang (n); + s->trigger_cue_row (n); } } diff --git a/gtk2_ardour/trigger_ui.h b/gtk2_ardour/trigger_ui.h index bf62bb1f24..3d2864c5d2 100644 --- a/gtk2_ardour/trigger_ui.h +++ b/gtk2_ardour/trigger_ui.h @@ -93,7 +93,7 @@ private: /* Actions for Triggers: accessed via ardour_ui and shortcuts and lua */ static Glib::RefPtr trigger_actions; - static void trigger_cue (int32_t); + static void trigger_cue_row (int32_t); static Gtkmm2ext::Bindings* bindings; static void load_bindings (); static void register_actions (); diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 084d23a289..eadea5ced2 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1371,7 +1371,7 @@ public: PBD::TimingStats dsp_stats[NTT]; int32_t first_cue_within (samplepos_t s, samplepos_t e, bool& was_recorded); - void cue_bang (int32_t); + void trigger_cue_row (int32_t); CueEvents const & cue_events() const { return _cue_events; } protected: diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index c272868b17..f32a9bb81f 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -1721,7 +1721,7 @@ Session::cue_marker_change (Location* /* ignored */) } void -Session::cue_bang (int32_t cue) +Session::trigger_cue_row (int32_t cue) { _pending_cue.store (cue); request_transport_speed (1.0); diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc index fe01d5e8dc..1e0333243f 100644 --- a/libs/surfaces/control_protocol/basic_ui.cc +++ b/libs/surfaces/control_protocol/basic_ui.cc @@ -469,9 +469,9 @@ BasicUI::stop_all_triggers (bool stop_all) } void -BasicUI::cue_bang (int cue_idx) +BasicUI::trigger_cue_row (int cue_idx) { - session->cue_bang (cue_idx); + session->trigger_cue_row (cue_idx); } void diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h index 512db6aa49..2d505553e2 100644 --- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h +++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h @@ -100,7 +100,7 @@ class LIBCONTROLCP_API BasicUI { void toggle_click(); void midi_panic(); - void cue_bang (int cue); + void trigger_cue_row (int cue); void stop_all_triggers (bool stop_now = false); void toggle_monitor_mute(); diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 6a8c454548..2743fa4512 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -459,7 +459,7 @@ OSC::register_callbacks() // locate ii is position and bool roll REGISTER_CALLBACK (serv, X_("/locate"), "ii", locate); - REGISTER_CALLBACK (serv, X_("/cue_bang"), "i", cue_bang); + REGISTER_CALLBACK (serv, X_("/trigger_cue_row"), "i", trigger_cue_row); REGISTER_CALLBACK (serv, X_("/stop_all_triggers"), "i", stop_all_triggers); REGISTER_CALLBACK (serv, X_("/save_state"), "", save_state); diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 8d6938c8ba..5bd6f1a918 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -486,7 +486,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI return 0; \ } - PATH_CALLBACK1(cue_bang,i,); + PATH_CALLBACK1(trigger_cue_row,i,); PATH_CALLBACK1(stop_all_triggers,i,); //0 = "stop at end of bar" 1 = "stop now" PATH_CALLBACK1(set_transport_speed,f,); diff --git a/libs/surfaces/push2/cues.cc b/libs/surfaces/push2/cues.cc index eb96e94425..b57fee2748 100644 --- a/libs/surfaces/push2/cues.cc +++ b/libs/surfaces/push2/cues.cc @@ -480,7 +480,7 @@ CueLayout::strip_vpot_touch (int n, bool touching) void CueLayout::button_rhs (int row) { - _p2.get_session().cue_bang (row + scene_base); + _p2.get_session().trigger_cue_row (row + scene_base); } void