X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fslave.h;h=cf8060d029efeb6dd98a4b810fe3b86be2da4425;hb=57f74fbf132ad4c2bc59f2f3d6e298936d752963;hp=48d9ac516236f6f7995107b30f7788de40903e0f;hpb=52532839110d4bbd2e4dc3e0eb8967d0f278a611;p=ardour.git diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 48d9ac5162..cf8060d029 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -24,31 +24,28 @@ #include -#include +#include #include "pbd/signals.h" #include "timecode/time.h" +#include "ardour/libardour_visibility.h" #include "ardour/types.h" #include "midi++/parser.h" #include "midi++/types.h" -#ifdef HAVE_LTC -#include -#endif - -// used for approximate_current_delta(): -#define PLUSMINUS(A) ( ((A)<0) ? "\u2012" : (((A)>0) ? "+" : "\u00B1") ) -namespace MIDI { - class Port; -} +/* used for approximate_current_delta(): */ +#define PLUSMINUS(A) ( ((A)<0) ? "-" : (((A)>0) ? "+" : "\u00B1") ) +#define LEADINGZERO(A) ( (A)<10 ? " " : (A)<100 ? " " : (A)<1000 ? " " : "" ) namespace ARDOUR { class TempoMap; class Session; +class AudioEngine; +class MidiPort; /** * @class Slave @@ -62,7 +59,7 @@ class Session; * Therefore it is rather that class, that makes ARDOUR a slave by connecting it * to its external time master. */ -class Slave { +class LIBARDOUR_API Slave { public: Slave() { } virtual ~Slave() {} @@ -183,15 +180,17 @@ class Slave { }; /// We need this wrapper for testability, it's just too hard to mock up a session class -class ISlaveSessionProxy { +class LIBARDOUR_API ISlaveSessionProxy { public: virtual ~ISlaveSessionProxy() {} - virtual TempoMap& tempo_map() const { return *((TempoMap *) 0); } - virtual framecnt_t frame_rate() const { return 0; } - virtual framepos_t audible_frame () const { return 0; } - virtual framepos_t transport_frame () const { return 0; } - virtual pframes_t frames_since_cycle_start () const { return 0; } - virtual framepos_t frame_time () const { return 0; } + virtual TempoMap& tempo_map() const { return *((TempoMap *) 0); } + virtual framecnt_t frame_rate() const { return 0; } + virtual pframes_t frames_per_cycle() const { return 0; } + virtual framepos_t audible_frame () const { return 0; } + virtual framepos_t transport_frame () const { return 0; } + virtual pframes_t frames_since_cycle_start () const { return 0; } + virtual framepos_t sample_time_at_cycle_start() const { return 0; } + virtual framepos_t frame_time () const { return 0; } virtual void request_locate (framepos_t /*frame*/, bool with_roll = false) { (void) with_roll; @@ -201,24 +200,26 @@ class ISlaveSessionProxy { /// The Session Proxy for use in real Ardour -class SlaveSessionProxy : public ISlaveSessionProxy { +class LIBARDOUR_API SlaveSessionProxy : public ISlaveSessionProxy { Session& session; public: SlaveSessionProxy(Session &s) : session(s) {} - TempoMap& tempo_map() const; - framecnt_t frame_rate() const; - framepos_t audible_frame () const; - framepos_t transport_frame () const; - pframes_t frames_since_cycle_start () const; - framepos_t frame_time () const; + TempoMap& tempo_map() const; + framecnt_t frame_rate() const; + pframes_t frames_per_cycle() const; + framepos_t audible_frame () const; + framepos_t transport_frame () const; + pframes_t frames_since_cycle_start () const; + framepos_t sample_time_at_cycle_start() const; + framepos_t frame_time () const; void request_locate (framepos_t frame, bool with_roll = false); void request_transport_speed (double speed); }; -struct SafeTime { +struct LIBARDOUR_API SafeTime { volatile int guard1; framepos_t position; framepos_t timestamp; @@ -234,26 +235,31 @@ struct SafeTime { } }; -class TimecodeSlave : public Slave { +class LIBARDOUR_API TimecodeSlave : public Slave { public: - TimecodeSlave () {} + TimecodeSlave () {} - virtual Timecode::TimecodeFormat apparent_timecode_format() const = 0; + virtual Timecode::TimecodeFormat apparent_timecode_format() const = 0; - /* this is intended to be used by a UI and polled from a timeout. it should - return a string describing the current position of the TC source. it - should NOT do any computation, but should use a cached value - of the TC source position. - */ - virtual std::string approximate_current_position() const = 0; + /* this is intended to be used by a UI and polled from a timeout. it should + return a string describing the current position of the TC source. it + should NOT do any computation, but should use a cached value + of the TC source position. + */ + virtual std::string approximate_current_position() const = 0; + + framepos_t timecode_offset; + bool timecode_negative_offset; + + PBD::Signal1 ActiveChanged; }; -class MTC_Slave : public TimecodeSlave { +class LIBARDOUR_API MTC_Slave : public TimecodeSlave { public: - MTC_Slave (Session&, MIDI::Port&); + MTC_Slave (Session&, MidiPort&); ~MTC_Slave (); - void rebind (MIDI::Port&); + void rebind (MidiPort&); bool speed_and_position (double&, framepos_t&); bool locked() const; @@ -261,7 +267,7 @@ class MTC_Slave : public TimecodeSlave { void handle_locate (const MIDI::byte*); framecnt_t resolution () const; - bool requires_seekahead () const { return true; } + bool requires_seekahead () const { return false; } framecnt_t seekahead_distance() const; bool give_slave_full_control_over_transport_speed() const; @@ -271,14 +277,16 @@ class MTC_Slave : public TimecodeSlave { private: Session& session; - MIDI::Port* port; + MidiPort* port; PBD::ScopedConnectionList port_connections; + PBD::ScopedConnection config_connection; bool can_notify_on_unknown_rate; static const int frame_tolerance; SafeTime current; framepos_t mtc_frame; /* current time */ + double mtc_frame_dll; framepos_t last_inbound_frame; /* when we got it; audio clocked */ MIDI::byte last_mtc_fps_byte; framepos_t window_begin; @@ -326,10 +334,11 @@ class MTC_Slave : public TimecodeSlave { bool outside_window (framepos_t) const; void init_mtc_dll(framepos_t, double); void init_engine_dll (framepos_t, framepos_t); + void parse_timecode_offset(); + void parameter_changed(std::string const & p); }; -#ifdef HAVE_LTC -class LTC_Slave : public TimecodeSlave { +class LIBARDOUR_API LTC_Slave : public TimecodeSlave { public: LTC_Slave (Session&); ~LTC_Slave (); @@ -349,7 +358,7 @@ public: std::string approximate_current_delta() const; private: - void parse_ltc(const jack_nframes_t, const jack_default_audio_sample_t * const, const framecnt_t); + void parse_ltc(const pframes_t, const Sample* const, const framecnt_t); void process_ltc(framepos_t const); void init_engine_dll (framepos_t, int32_t); bool detect_discontinuity(LTCFrameExt *, int, bool); @@ -358,6 +367,8 @@ public: void reset(); void resync_xrun(); void resync_latency(); + void parse_timecode_offset(); + void parameter_changed(std::string const & p); Session& session; bool did_reset_tc_format; @@ -379,11 +390,13 @@ public: int ltc_detect_fps_cnt; int ltc_detect_fps_max; bool printed_timecode_warning; + bool sync_lock_broken; Timecode::TimecodeFormat ltc_timecode; Timecode::TimecodeFormat a3e_timecode; PBD::ScopedConnectionList port_connections; - jack_latency_range_t ltc_slave_latency; + PBD::ScopedConnection config_connection; + LatencyRange ltc_slave_latency; /* DLL - chase LTC */ int transport_direction; @@ -393,17 +406,16 @@ public: double e2; ///< second order loop error double b, c; ///< DLL filter coefficients }; -#endif -class MIDIClock_Slave : public Slave { +class LIBARDOUR_API MIDIClock_Slave : public Slave { public: - MIDIClock_Slave (Session&, MIDI::Port&, int ppqn = 24); + MIDIClock_Slave (Session&, MidiPort&, int ppqn = 24); /// Constructor for unit tests MIDIClock_Slave (ISlaveSessionProxy* session_proxy = 0, int ppqn = 24); ~MIDIClock_Slave (); - void rebind (MIDI::Port&); + void rebind (MidiPort&); bool speed_and_position (double&, framepos_t&); bool locked() const; @@ -419,7 +431,6 @@ class MIDIClock_Slave : public Slave { protected: ISlaveSessionProxy* session; - MIDI::Port* port; PBD::ScopedConnectionList port_connections; /// pulses per quarter note for one MIDI clock frame (default 24) @@ -482,11 +493,11 @@ class MIDIClock_Slave : public Slave { bool _starting; }; -class JACK_Slave : public Slave +class LIBARDOUR_API Engine_Slave : public Slave { public: - JACK_Slave (jack_client_t*); - ~JACK_Slave (); + Engine_Slave (AudioEngine&); + ~Engine_Slave (); bool speed_and_position (double& speed, framepos_t& pos); @@ -495,12 +506,10 @@ class JACK_Slave : public Slave bool ok() const; framecnt_t resolution () const { return 1; } bool requires_seekahead () const { return false; } - void reset_client (jack_client_t* jack); bool is_always_synced() const { return true; } private: - jack_client_t* jack; - double speed; + AudioEngine& engine; bool _starting; };