diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2018-09-18 18:51:59 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2018-09-18 19:06:04 -0400 |
commit | e6915e01de2e2167c3384c6c8f2408f763971616 (patch) | |
tree | c67200eda4cf4c595503a850fe6ae72d89032a6f /libs/ardour/ardour/session_event.h | |
parent | 7390b88c2bb29b1b34624f441adec1e71c74bad8 (diff) |
new transport slave/master implementation, libs/ edition
Diffstat (limited to 'libs/ardour/ardour/session_event.h')
-rw-r--r-- | libs/ardour/ardour/session_event.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h index aaa254e003..37e229acfb 100644 --- a/libs/ardour/ardour/session_event.h +++ b/libs/ardour/ardour/session_event.h @@ -33,7 +33,7 @@ namespace ARDOUR { -class Slave; +class TransportMaster; class Region; class LIBARDOUR_API SessionEvent { @@ -49,7 +49,6 @@ public: RangeStop, RangeLocate, Overwrite, - SetSyncSource, Audition, SetPlayAudioRange, CancelPlayAudioRange, @@ -58,6 +57,7 @@ public: AdjustCaptureBuffering, SetTimecodeTransmission, Skip, + SetTransportMaster, /* only one of each of these events can be queued at any one time */ @@ -79,11 +79,10 @@ public: double speed; union { - void* ptr; - bool yes_or_no; - samplepos_t target2_sample; - Slave* slave; - Route* route; + void* ptr; + bool yes_or_no; + samplepos_t target2_sample; + Route* route; }; union { @@ -109,6 +108,7 @@ public: std::list<MusicRange> music_range; boost::shared_ptr<Region> region; + boost::shared_ptr<TransportMaster> transport_master; SessionEvent (Type t, Action a, samplepos_t when, samplepos_t where, double spd, bool yn = false, bool yn2 = false, bool yn3 = false); |