X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fslave.h;h=cf8060d029efeb6dd98a4b810fe3b86be2da4425;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hp=7e80055f945a5c74800cfc4f45ce258ccb7535ab;hpb=2b9421fd391efcddde0be3397cb66e19b744a155;p=ardour.git

diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 7e80055f94..cf8060d029 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -24,7 +24,6 @@
 
 #include <glibmm/threads.h>
 
-#include <jack/jack.h>
 #include <ltc.h>
 
 #include "pbd/signals.h"
@@ -190,7 +189,7 @@ class LIBARDOUR_API ISlaveSessionProxy {
 	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 pframes_t  sample_time_at_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) {
@@ -213,7 +212,7 @@ class LIBARDOUR_API SlaveSessionProxy : public ISlaveSessionProxy {
 	framepos_t audible_frame ()              const;
 	framepos_t transport_frame ()            const;
 	pframes_t  frames_since_cycle_start ()   const;
-	pframes_t  sample_time_at_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);
@@ -238,19 +237,21 @@ struct LIBARDOUR_API SafeTime {
 
 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;
+	framepos_t        timecode_offset;
+	bool              timecode_negative_offset;
+
+	PBD::Signal1<void, bool> ActiveChanged;
 };
 
 class LIBARDOUR_API MTC_Slave : public TimecodeSlave {
@@ -389,6 +390,7 @@ 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;
 
@@ -508,7 +510,6 @@ class LIBARDOUR_API Engine_Slave : public Slave
 
   private:
         AudioEngine& engine;
-	double speed;
 	bool _starting;
 };