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

remove PostTransportRoll enum.

Browse source 
The decision to roll or not, and the handling of the decision, is the responsibility of the TransportFSM. No enum required
This commit is contained in:
Paul Davis 2021-05-03 17:32:27 -06:00
parent 79a823d2cb
commit 3d10f44b30
3 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1212,7 +1212,6 @@ public:
enum PostTransportWork { enum PostTransportWork {
PostTransportStop = 0x1, PostTransportStop = 0x1,
PostTransportLocate = 0x2, PostTransportLocate = 0x2,
PostTransportRoll = 0x4,
PostTransportAbort = 0x8, PostTransportAbort = 0x8,
PostTransportOverWrite = 0x10, PostTransportOverWrite = 0x10,
PostTransportAudition = 0x20, PostTransportAudition = 0x20,

1
libs/ardour/enums.cc
View file

@ -482,7 +482,6 @@ setup_enum_writer ()
REGISTER_CLASS_ENUM (Session, PostTransportStop); REGISTER_CLASS_ENUM (Session, PostTransportStop);
REGISTER_CLASS_ENUM (Session, PostTransportLocate); REGISTER_CLASS_ENUM (Session, PostTransportLocate);
REGISTER_CLASS_ENUM (Session, PostTransportRoll);
REGISTER_CLASS_ENUM (Session, PostTransportAbort); REGISTER_CLASS_ENUM (Session, PostTransportAbort);
REGISTER_CLASS_ENUM (Session, PostTransportOverWrite); REGISTER_CLASS_ENUM (Session, PostTransportOverWrite);
REGISTER_CLASS_ENUM (Session, PostTransportAudition); REGISTER_CLASS_ENUM (Session, PostTransportAudition);

13
libs/ardour/session_transport.cc
View file

@ -281,11 +281,6 @@ Session::locate (samplepos_t target_sample, bool with_roll, bool for_loop_end, b
if (force || !for_loop_end) { if (force || !for_loop_end) {
PostTransportWork todo = PostTransportLocate; PostTransportWork todo = PostTransportLocate;
if (with_roll && transport_was_stopped) {
todo = PostTransportWork (todo | PostTransportRoll);
}
add_post_transport_work (todo); add_post_transport_work (todo);
need_butler = true; need_butler = true;
@ -650,7 +645,7 @@ Session::should_roll_after_locate () const
* this answer can be considered correct * this answer can be considered correct
*/ */
return ((!config.get_external_sync() && (auto_play_legal && config.get_auto_play())) && !_exporting) || (post_transport_work() & PostTransportRoll); return ((!config.get_external_sync() && (auto_play_legal && config.get_auto_play())) && !_exporting);
} }
@ -683,12 +678,6 @@ Session::butler_completed_transport_work ()
TFSM_EVENT (TransportFSM::LocateDone); TFSM_EVENT (TransportFSM::LocateDone);
} }
bool start_after_butler_done_msg = false;
if (ptw & PostTransportRoll) {
start_after_butler_done_msg = true;
}
/* the butler finished its work so clear all PostTransportWork flags /* the butler finished its work so clear all PostTransportWork flags
*/ */