sorta-kinda working latency compensation, latency reporting and capture alignment ... working except that we report the wrong information to JACK and i've noticed a couple of odd circumstances where turning on a latent plugin caused punch recording to fail

git-svn-id: svn://localhost/ardour2/branches/3.0@9121 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 files changed, 56 insertions, 51 deletions

diff --git a/libs/ardour/ardour/audio_buffer.h b/libs/ardour/ardour/audio_buffer.h
index 0f71a00982..10f5f27ec3 100644
--- a/libs/ardour/ardour/audio_buffer.h
+++ b/libs/ardour/ardour/audio_buffer.h
@@ -166,7 +166,7 @@ public:
 		return _data + offset;
 	}
 
-	void prepare () { _written = false; }
+	void prepare () { _written = false; _silent = false; }
 	bool written() const { return _written; }
 
   private:
diff --git a/libs/ardour/ardour/audio_port.h b/libs/ardour/ardour/audio_port.h
index ffd1f8d9b0..1d107dfe73 100644
--- a/libs/ardour/ardour/audio_port.h
+++ b/libs/ardour/ardour/audio_port.h
@@ -41,11 +41,11 @@ class AudioPort : public Port
 
 	size_t raw_buffer_size (pframes_t nframes) const;
 
-	Buffer& get_buffer (framecnt_t nframes) {
+	Buffer& get_buffer (pframes_t nframes) {
 		return get_audio_buffer (nframes);
 	}
 
-	AudioBuffer& get_audio_buffer (framecnt_t nframes);
+	AudioBuffer& get_audio_buffer (pframes_t nframes);
 
   protected:
 	friend class AudioEngine;
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index de179d71a6..e025169f0a 100644
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -187,7 +187,6 @@ class AudioEngine : public SessionHandlePtr
 	void get_physical_inputs (DataType type, std::vector<std::string>&);
 
 	void update_total_latencies ();
-	void update_total_latency (const Port&);
 
 	Port *get_port_by_name (const std::string &);
 
@@ -320,10 +319,8 @@ _	   the regular process() call to session->process() is not made.
 
         void set_jack_callbacks ();
 
-#ifdef HAVE_JACK_NEW_LATENCY
         static void _latency_callback (jack_latency_callback_mode_t, void*);
         void jack_latency_callback (jack_latency_callback_mode_t);
-#endif
 
 	int connect_to_jack (std::string client_name, std::string session_uuid);
 
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index 99893976ba..cf6b0fe9ea 100644
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -75,7 +75,6 @@ public:
 	void flush_buffers (framecnt_t nframes, framepos_t time);
 	void no_outs_cuz_we_no_monitor(bool);
 	void cycle_start (pframes_t);
-	void increment_output_offset (framecnt_t);
 	void transport_stopped (framepos_t frame);
 
 	BufferSet& output_buffers() { return *_output_buffers; }
@@ -105,7 +104,6 @@ public:
 	Role        _role;
 	BufferSet*  _output_buffers;
 	gain_t      _current_gain;
-	framecnt_t  _output_offset;
 	bool        _no_outs_cuz_we_no_monitor;
 	boost::shared_ptr<MuteMaster> _mute_master;
 	bool         no_panner_reset;
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 8a3884b95f..90544450ef 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -90,6 +90,7 @@ class IO : public SessionObject, public Latent
 	bool set_name (const std::string& str);
 
 	virtual void silence (framecnt_t);
+        void increment_port_buffer_offset (pframes_t offset);
 
 	int ensure_io (ChanCount cnt, bool clear, void *src);
 
@@ -111,9 +112,6 @@ class IO : public SessionObject, public Latent
         
 	framecnt_t signal_latency () const { return _own_latency; }
 	framecnt_t latency () const;
-	void set_port_latency (framecnt_t);
-
-	void update_port_total_latencies ();
 
 	PortSet& ports() { return _ports; }
 	const PortSet& ports() const { return _ports; }
diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h
index cb80b74351..40a974156c 100644
--- a/libs/ardour/ardour/io_processor.h
+++ b/libs/ardour/ardour/io_processor.h
@@ -65,6 +65,8 @@ class IOProcessor : public Processor
 	void silence (framecnt_t nframes);
 	void disconnect ();
 
+        void increment_port_buffer_offset (pframes_t);
+
 	virtual bool feeds (boost::shared_ptr<Route> other) const;
 
 	PBD::Signal2<void,IOProcessor*,bool>     AutomationPlaybackChanged;
diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index b7c80e0c01..d95296ef76 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -46,11 +46,11 @@ class MidiPort : public Port {
 
 	size_t raw_buffer_size (pframes_t nframes) const;
 
-	Buffer& get_buffer (framecnt_t nframes) {
+	Buffer& get_buffer (pframes_t nframes) {
 		return get_midi_buffer (nframes);
 	}
 
-	MidiBuffer& get_midi_buffer (framecnt_t nframes);
+	MidiBuffer& get_midi_buffer (pframes_t nframes);
 
   protected:
 	friend class AudioEngine;
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index 0e36a6d9cb..2308f3cdc6 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -52,8 +52,6 @@ public:
 		return DataType::MIDI;
 	}
 
-	void set_latency_delay (framecnt_t);
-
 	int export_stuff (BufferSet& bufs, framecnt_t nframes, framepos_t end_frame);
 
 	void freeze_me (InterThreadInfo&);
diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index 300ecc24af..45595be422 100644
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -20,6 +20,8 @@
 #ifndef __ardour_port_h__
 #define __ardour_port_h__
 
+#include "libardour-config.h"
+
 #include <set>
 #include <string>
 #include <vector>
@@ -45,9 +47,6 @@ public:
 
 	virtual ~Port ();
 
-	static void set_buffer_size (pframes_t sz) {
-		_buffer_size = sz;
-	}
 	static void set_connecting_blocked( bool yn ) { 
 		_connecting_blocked = yn;
 	}
@@ -93,16 +92,22 @@ public:
 
 	void ensure_monitor_input (bool);
 	bool monitoring_input () const;
-	framecnt_t total_latency () const;
 	int reestablish ();
 	int reconnect ();
 	void request_monitor_input (bool);
-	void set_latency (framecnt_t);
         
-#ifdef HAVE_JACK_NEW_LATENCY
+        bool last_monitor() const { return _last_monitor; }
+        void set_last_monitor (bool yn) { _last_monitor = yn; }
+
+        jack_port_t* jack_port() const { return _jack_port; }
+        
         void get_connected_latency_range (jack_latency_range_t& range, bool playback) const;
-        void set_latency_range (jack_latency_range_t& range, bool playback) const;
-#endif
+
+        void set_private_latency_range (jack_latency_range_t& range, bool playback);
+        const jack_latency_range_t&  private_latency_range (bool playback) const;
+
+        void set_public_latency_range (jack_latency_range_t& range, bool playback) const;
+        jack_latency_range_t public_latency_range (bool playback) const;
 
 	virtual void reset ();
 
@@ -110,10 +115,10 @@ public:
 	virtual size_t raw_buffer_size (pframes_t nframes) const = 0;
 
 	virtual DataType type () const = 0;
-	virtual void cycle_start (pframes_t) = 0;
+	virtual void cycle_start (pframes_t);
 	virtual void cycle_end (pframes_t) = 0;
 	virtual void cycle_split () = 0;
-	virtual Buffer& get_buffer (framecnt_t nframes) = 0;
+	virtual Buffer& get_buffer (pframes_t nframes) = 0;
 	virtual void flush_buffers (pframes_t nframes, framepos_t /*time*/) {}
 	virtual void transport_stopped () {}
 
@@ -124,41 +129,44 @@ public:
 	PBD::Signal1<void,bool> MonitorInputChanged;
 
 
-	static framecnt_t port_offset() { return _port_offset; }
-
-	static void set_port_offset (framecnt_t off) {
-		_port_offset = off;
+        static void set_cycle_framecnt (pframes_t n) {
+                _cycle_nframes = n;
+        }
+	static framecnt_t port_offset() { return _global_port_buffer_offset; }
+	static void set_global_port_buffer_offset (pframes_t off) {
+		_global_port_buffer_offset = off;
 	}
-	
-	static void increment_port_offset (framecnt_t n) {
-		_port_offset += n;
+	static void increment_global_port_buffer_offset (pframes_t n) {
+		_global_port_buffer_offset += n;
 	}
 
+        virtual void increment_port_buffer_offset (pframes_t n);
+
 protected:
 
 	Port (std::string const &, DataType, Flags);
 
 	jack_port_t* _jack_port; ///< JACK port
 
-	static pframes_t  _buffer_size;
 	static bool	  _connecting_blocked;
-	static framecnt_t _port_offset;
+	static pframes_t  _global_port_buffer_offset;   /* access only from process() tree */
+        static pframes_t  _cycle_nframes; /* access only from process() tree */
+
+        framecnt_t _port_buffer_offset; /* access only from process() tree */
+
+        jack_latency_range_t _private_playback_latency;
+        jack_latency_range_t _private_capture_latency;
         
 	static AudioEngine* _engine; ///< the AudioEngine
 
 private:
-	friend class AudioEngine;
-
-	void recompute_total_latency () const;
-
-	/* XXX */
-	bool _last_monitor;
-
 	std::string _name;  ///< port short name
 	Flags       _flags; ///< flags
+	bool        _last_monitor;
 
 	/** ports that we are connected to, kept so that we can
-	    reconnect to JACK when required */
+	    reconnect to JACK when required 
+        */
 	std::set<std::string> _connections;
 
 };
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 3b45020727..3c9d206760 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -250,11 +250,15 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
 	void all_processors_flip();
 	void all_processors_active (Placement, bool state);
 
-        void set_latency_ranges (bool playback) const;
-	virtual framecnt_t update_total_latency();
-	void set_latency_delay (framecnt_t);
+        framecnt_t set_private_port_latencies (bool playback) const;
+        void       set_public_port_latencies (framecnt_t, bool playback) const;
+
+	framecnt_t   update_signal_latency();
+	virtual void set_latency_compensation (framecnt_t);
+
 	void set_user_latency (framecnt_t);
 	framecnt_t initial_delay() const { return _initial_delay; }
+        framecnt_t signal_latency() const { return _signal_latency; }
 
 	PBD::Signal0<void>       active_changed;
 	PBD::Signal0<void>       phase_invert_changed;
@@ -426,6 +430,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
 	boost::shared_ptr<IO> _output;
 
 	bool           _active;
+        framecnt_t     _signal_latency;
 	framecnt_t     _initial_delay;
 	framecnt_t     _roll_delay;
 
@@ -517,7 +522,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
 	void set_mute_master_solo ();
 
 	void set_processor_positions ();
-        void update_port_latencies (const PortSet& ports, const PortSet& feeders, bool playback, framecnt_t) const;
+        framecnt_t update_port_latencies (const PortSet& ports, const PortSet& feeders, bool playback, framecnt_t) const;
 
 	void setup_invisible_processors ();
 
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 47285088ff..f5b6db4448 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -20,6 +20,8 @@
 #ifndef __ardour_session_h__
 #define __ardour_session_h__
 
+#include "libardour-config.h"
+
 #include <list>
 #include <map>
 #include <set>
@@ -818,7 +820,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
   protected:
 	friend class Route;
 	void schedule_curve_reallocation ();
-	void update_latency_compensation (bool, bool);
+	void update_latency_compensation (bool, bool, bool force=false);
 
   private:
 	int  create (const std::string& mix_template, BusProfile*);
@@ -1364,9 +1366,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	void reset_jack_connection (jack_client_t* jack);
 	void process_rtop (SessionEvent*);
 
-#ifdef HAVE_JACK_NEW_LATENCY
         void  update_latency (bool playback);
-#endif
 
 	XMLNode& state(bool);
 
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index aadc2f7797..f92d11ab4c 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -67,8 +67,7 @@ class Track : public Route, public PublicDiskstream
         virtual void use_new_diskstream () = 0;
         virtual void set_diskstream (boost::shared_ptr<Diskstream>);
 
-	framecnt_t update_total_latency();
-	void set_latency_delay (framecnt_t);
+	void set_latency_compensation (framecnt_t);
 
 	enum FreezeState {
 		NoFreeze,