smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

disambiguate trigger functions: stop_all_triggers -> trigger_stop_all

Browse source
This commit is contained in:
Ben Loftis 2022-09-27 09:09:31 -05:00
parent 75ae0fd4b1
commit 1e283adb22
8 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/trigger_master.cc
View file

@ -579,9 +579,9 @@ CueMaster::event_handler (GdkEvent* ev)
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
if (ev->button.button == 1) { if (ev->button.button == 1) {
if (Keyboard::modifier_state_equals (ev->button.state, Keyboard::PrimaryModifier)) { if (Keyboard::modifier_state_equals (ev->button.state, Keyboard::PrimaryModifier)) {
_session->stop_all_triggers (true); //stop 'now' _session->trigger_stop_all (true); //stop 'now'
} else { } else {
_session->stop_all_triggers (false); //stop quantized (bar end) _session->trigger_stop_all (false); //stop quantized (bar end)
} }
return true; return true;
} }

2
libs/ardour/ardour/session.h
View file

@ -490,7 +490,7 @@ public:
double default_play_speed (); double default_play_speed ();
void reset_transport_speed (TransportRequestSource origin = TRS_UI); void reset_transport_speed (TransportRequestSource origin = TRS_UI);
void stop_all_triggers (bool now = true); void trigger_stop_all (bool now = true);
void request_transport_speed (double speed, TransportRequestSource origin = TRS_UI); void request_transport_speed (double speed, TransportRequestSource origin = TRS_UI);
void request_default_play_speed (double speed, TransportRequestSource origin = TRS_UI); void request_default_play_speed (double speed, TransportRequestSource origin = TRS_UI);

2
libs/ardour/session_transport.cc
View file

@ -434,7 +434,7 @@ Session::set_transport_speed (double speed)
/** Called from the gui thread */ /** Called from the gui thread */
void void
Session::stop_all_triggers (bool now) Session::trigger_stop_all (bool now)
{ {
boost::shared_ptr<RouteList> rl = routes.reader(); boost::shared_ptr<RouteList> rl = routes.reader();

4
libs/surfaces/control_protocol/basic_ui.cc
View file

@ -463,9 +463,9 @@ BasicUI::transport_rolling () const
} }
void void
BasicUI::stop_all_triggers (bool stop_all) BasicUI::trigger_stop_all (bool stop_all)
{ {
session->stop_all_triggers (stop_all); session->trigger_stop_all (stop_all);
} }
void void

2
libs/surfaces/control_protocol/control_protocol/basic_ui.h
View file

@ -101,7 +101,7 @@ class LIBCONTROLCP_API BasicUI {
void midi_panic(); void midi_panic();
void trigger_cue_row (int cue); void trigger_cue_row (int cue);
void stop_all_triggers (bool stop_now = false); void trigger_stop_all (bool stop_now = false);
void toggle_monitor_mute(); void toggle_monitor_mute();
void toggle_monitor_dim(); void toggle_monitor_dim();

2
libs/surfaces/osc/osc.cc
View file

@ -460,7 +460,7 @@ OSC::register_callbacks()
REGISTER_CALLBACK (serv, X_("/locate"), "ii", locate); REGISTER_CALLBACK (serv, X_("/locate"), "ii", locate);
REGISTER_CALLBACK (serv, X_("/trigger_cue_row"), "i", trigger_cue_row); 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_("/trigger_stop_all"), "i", trigger_stop_all);
REGISTER_CALLBACK (serv, X_("/save_state"), "", save_state); REGISTER_CALLBACK (serv, X_("/save_state"), "", save_state);
REGISTER_CALLBACK (serv, X_("/save_state"), "f", save_state); REGISTER_CALLBACK (serv, X_("/save_state"), "f", save_state);

2
libs/surfaces/osc/osc.h
View file

@ -487,7 +487,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
} }
PATH_CALLBACK1(trigger_cue_row,i,); PATH_CALLBACK1(trigger_cue_row,i,);
PATH_CALLBACK1(stop_all_triggers,i,); //0 = "stop at end of bar" 1 = "stop now" PATH_CALLBACK1(trigger_stop_all,i,); //0 = "stop at end of bar" 1 = "stop now"
PATH_CALLBACK1(set_transport_speed,f,); PATH_CALLBACK1(set_transport_speed,f,);
PATH_CALLBACK1(add_marker_name,s,&); PATH_CALLBACK1(add_marker_name,s,&);

2
libs/surfaces/push2/cues.cc
View file

@ -487,7 +487,7 @@ void
CueLayout::button_stop_press () CueLayout::button_stop_press ()
{ {
if (_p2.modifier_state() == Push2::ModShift) { if (_p2.modifier_state() == Push2::ModShift) {
_p2.get_session().stop_all_triggers (false); /* quantized global stop */ _p2.get_session().trigger_stop_all (false); /* quantized global stop */
} }
} }
void void