ardour/livetrax
13
0
Fork 0
Code

const-ify TransportFSM

Browse Source
This commit is contained in:
Paul Davis 2019-09-20 09:44:15 -06:00
parent 30a1cffcdc
commit 4d2ccdd905
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/ardour/ardour/transport_fsm.h
View File

@ -127,27 +127,27 @@ struct TransportFSM
/* transition actions */ /* transition actions */
void schedule_butler_for_transport_work (); void schedule_butler_for_transport_work () const;
void start_playback (); void start_playback () const;
void stop_playback (); void stop_playback () const;
void start_saved_locate (); void start_saved_locate () const;
void roll_after_locate (); void roll_after_locate () const;
void start_locate (Event const &); void start_locate (Event const &) const;
void interrupt_locate (Event const &); void interrupt_locate (Event const &) const;
void save_locate_and_start_declick (Event const &); void save_locate_and_start_declick (Event const &);
void start_declick (Event const &); void start_declick (Event const &);
/* guards */ /* guards */
bool should_roll_after_locate (); bool should_roll_after_locate () const;
bool should_not_roll_after_locate () { return !should_roll_after_locate (); } bool should_not_roll_after_locate () const { return !should_roll_after_locate (); }
public: public:
bool locating () { return _motion_state == WaitingForLocate; } bool locating () const { return _motion_state == WaitingForLocate; }
bool rolling () { return _motion_state == Rolling; } bool rolling () const { return _motion_state == Rolling; }
bool stopped () { return _motion_state == Stopped; } bool stopped () const { return _motion_state == Stopped; }
bool waiting_for_butler() { return _butler_state == WaitingForButler; } bool waiting_for_butler() const { return _butler_state == WaitingForButler; }
bool declick_in_progress() { return _motion_state == DeclickToLocate || _motion_state == DeclickToStop; } bool declick_in_progress() const { return _motion_state == DeclickToLocate || _motion_state == DeclickToStop; }
void enqueue (Event* ev) { void enqueue (Event* ev) {
queued_events.push_back (*ev); queued_events.push_back (*ev);

16
libs/ardour/transport_fsm.cc
View File

@ -298,7 +298,7 @@ TransportFSM::process_event (Event& ev)
/* transition actions */ /* transition actions */
void void
TransportFSM::start_playback () TransportFSM::start_playback () const
{ {
DEBUG_TRACE (DEBUG::TFSMEvents, "tfsm::start_playback\n"); DEBUG_TRACE (DEBUG::TFSMEvents, "tfsm::start_playback\n");
api->start_transport(); api->start_transport();
@ -313,7 +313,7 @@ TransportFSM::start_declick (Event const & s)
} }
void void
TransportFSM::stop_playback () TransportFSM::stop_playback () const
{ {
DEBUG_TRACE (DEBUG::TFSMEvents, "tfsm::stop_playback\n"); DEBUG_TRACE (DEBUG::TFSMEvents, "tfsm::stop_playback\n");
api->stop_transport (_last_stop.abort, _last_stop.clear_state); api->stop_transport (_last_stop.abort, _last_stop.clear_state);
@ -329,7 +329,7 @@ TransportFSM::save_locate_and_start_declick (Event const & l)
} }
void void
TransportFSM::start_locate (Event const & l) TransportFSM::start_locate (Event const & l) const
{ {
assert (l.type == Locate); assert (l.type == Locate);
DEBUG_TRACE (DEBUG::TFSMEvents, "tfsm::start_locate\n"); DEBUG_TRACE (DEBUG::TFSMEvents, "tfsm::start_locate\n");
@ -337,14 +337,14 @@ TransportFSM::start_locate (Event const & l)
} }
void void
TransportFSM::start_saved_locate () TransportFSM::start_saved_locate () const
{ {
DEBUG_TRACE (DEBUG::TFSMEvents, "tfsm::start_save\n"); DEBUG_TRACE (DEBUG::TFSMEvents, "tfsm::start_save\n");
api->locate (_last_locate.target, _last_locate.with_roll, _last_locate.with_flush, _last_locate.with_loop, _last_locate.force); api->locate (_last_locate.target, _last_locate.with_roll, _last_locate.with_flush, _last_locate.with_loop, _last_locate.force);
} }
void void
TransportFSM::interrupt_locate (Event const & l) TransportFSM::interrupt_locate (Event const & l) const
{ {
assert (l.type == Locate); assert (l.type == Locate);
DEBUG_TRACE (DEBUG::TFSMEvents, "tfsm::interrupt\n"); DEBUG_TRACE (DEBUG::TFSMEvents, "tfsm::interrupt\n");
@ -355,13 +355,13 @@ TransportFSM::interrupt_locate (Event const & l)
} }
void void
TransportFSM::schedule_butler_for_transport_work () TransportFSM::schedule_butler_for_transport_work () const
{ {
api->schedule_butler_for_transport_work (); api->schedule_butler_for_transport_work ();
} }
bool bool
TransportFSM::should_roll_after_locate () TransportFSM::should_roll_after_locate () const
{ {
bool ret = api->should_roll_after_locate (); bool ret = api->should_roll_after_locate ();
DEBUG_TRACE (DEBUG::TFSMEvents, string_compose ("tfsm::should_roll_after_locate() ? %1\n", ret)); DEBUG_TRACE (DEBUG::TFSMEvents, string_compose ("tfsm::should_roll_after_locate() ? %1\n", ret));
@ -369,7 +369,7 @@ TransportFSM::should_roll_after_locate ()
} }
void void
TransportFSM::roll_after_locate () TransportFSM::roll_after_locate () const
{ {
DEBUG_TRACE (DEBUG::TFSMEvents, "rolling after locate\n"); DEBUG_TRACE (DEBUG::TFSMEvents, "rolling after locate\n");
api->start_transport (); api->start_transport ();