disambiguate trigger functions: cue_bang -> trigger_cue_row

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:

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&);
 

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);
 	}
 }
 

gtk2_ardour/trigger_ui.h

@@ -93,7 +93,7 @@ private:
 
 	/* Actions for Triggers: accessed via ardour_ui and shortcuts and lua */
 	static Glib::RefPtr<Gtk::ActionGroup> 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 ();

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:

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

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

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

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

libs/surfaces/osc/osc.h

@@ -486,7 +486,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 		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,);

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