X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fslave.h;h=73b66ca20e530eef9585c09565bfac2c7774c414;hb=6698f5f686bef82b0c9568558c83a3b9b3344700;hp=0079c10e0a952c2458d78d1597658f5ae94ba3d1;hpb=eb3f77df5748e81c4a6bfe737cd9b5a3d721a86c;p=ardour.git

diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 0079c10e0a..73b66ca20e 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_slave_h__
@@ -42,11 +41,11 @@ class Slave {
 	Slave() { }
 	virtual ~Slave() {}
 
-	virtual bool speed_and_position (float&, jack_nframes_t&) = 0;
+	virtual bool speed_and_position (float&, nframes_t&) = 0;
 	virtual bool locked() const = 0;
 	virtual bool ok() const = 0;
 	virtual bool starting() const { return false; }
-	virtual jack_nframes_t resolution() const = 0;
+	virtual nframes_t resolution() const = 0;
 	virtual bool requires_seekahead () const = 0;
 };
 
@@ -57,27 +56,28 @@ class MTC_Slave : public Slave, public sigc::trackable {
 	~MTC_Slave ();
 
 	void rebind (MIDI::Port&);
-	bool speed_and_position (float&, jack_nframes_t&);
+	bool speed_and_position (float&, nframes_t&);
 
 	bool      locked() const;
 	bool      ok() const;
 	void      handle_locate (const MIDI::byte*);
 
-	jack_nframes_t resolution() const;
+	nframes_t resolution() const;
 	bool requires_seekahead () const { return true; }
 
   private:
 	Session&    session;
 	MIDI::Port* port;
 	std::vector<sigc::connection> connections;
+	bool        can_notify_on_unknown_rate;
 
 	struct SafeTime {
 
 
 	    int guard1;
 	    //SMPTE_Time  mtc;
-	    jack_nframes_t   position;
-	    jack_nframes_t   timestamp;
+	    nframes_t   position;
+	    nframes_t   timestamp;
 	    int guard2;
 
 	    SafeTime() {
@@ -88,12 +88,12 @@ class MTC_Slave : public Slave, public sigc::trackable {
 	};
 
 	SafeTime         current;
-	jack_nframes_t   mtc_frame;               /* current time */
-	jack_nframes_t   last_inbound_frame;      /* when we got it; audio clocked */
+	nframes_t   mtc_frame;               /* current time */
+	nframes_t   last_inbound_frame;      /* when we got it; audio clocked */
 
 	float            mtc_speed;
-	jack_nframes_t   first_mtc_frame;
-	jack_nframes_t   first_mtc_time;
+	nframes_t   first_mtc_frame;
+	nframes_t   first_mtc_time;
 
 	static const int32_t accumulator_size = 128;
 	float   accumulator[accumulator_size];
@@ -113,7 +113,7 @@ class ADAT_Slave : public Slave
 	ADAT_Slave () {}
 	~ADAT_Slave () {}
 	
-	bool speed_and_position (float& speed, jack_nframes_t& pos) {
+	bool speed_and_position (float& speed, nframes_t& pos) {
 		speed = 0;
 		pos = 0;
 		return false;
@@ -121,7 +121,7 @@ class ADAT_Slave : public Slave
 
 	bool locked() const { return false; }
 	bool ok() const { return false; }
-	jack_nframes_t resolution() const { return 1; }
+	nframes_t resolution() const { return 1; }
 	bool requires_seekahead () const { return true; }
 };
 
@@ -131,13 +131,14 @@ class JACK_Slave : public Slave
 	JACK_Slave (jack_client_t*);
 	~JACK_Slave ();
 	
-	bool speed_and_position (float& speed, jack_nframes_t& pos);
+	bool speed_and_position (float& speed, nframes_t& pos);
 
 	bool starting() const { return _starting; }
 	bool locked() const;
 	bool ok() const;
-	jack_nframes_t resolution() const { return 1; }
+	nframes_t resolution() const { return 1; }
 	bool requires_seekahead () const { return false; }
+	void reset_client (jack_client_t* jack);
 
   private:
 	jack_client_t* jack;