more purging of JACK as an explicit name from libardour

libs/ardour/ardour/diskstream.h

@@ -133,8 +133,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
 	virtual XMLNode& get_state(void);
 	virtual int      set_state(const XMLNode&, int version);
 
-	virtual void request_jack_monitors_input (bool) {}
-	virtual void ensure_jack_monitors_input (bool) {}
+	virtual void request_input_monitoring (bool) {}
+	virtual void ensure_input_monitoring (bool) {}
 
 	framecnt_t   capture_offset() const { return _capture_offset; }
 	virtual void set_capture_offset ();

libs/ardour/ardour/jack_portengine.h

@@ -25,6 +25,9 @@
 
 #include <stdint.h>
 
+#include <jack/types.h>
+#include <jack/midiport.h>
+
 #include <boost/shared_ptr.hpp>
 
 #include "pbd/signals.h"

libs/ardour/ardour/midi_diskstream.h

@@ -81,7 +81,7 @@ class MidiDiskstream : public Diskstream
 	XMLNode& get_state(void);
 	int set_state(const XMLNode&, int version);
 
-	void ensure_jack_monitors_input (bool);
+	void ensure_input_monitoring (bool);
 
 	boost::shared_ptr<SMFSource> write_source ()    { return _write_source; }
 

libs/ardour/ardour/midi_port.h

@@ -67,7 +67,7 @@ class MidiPort : public Port {
 	bool        _resolve_required;
 	bool        _input_active;
 
-	void resolve_notes (void* jack_buffer, MidiBuffer::TimeType when);
+	void resolve_notes (void* buffer, MidiBuffer::TimeType when);
 };
 
 } // namespace ARDOUR

libs/ardour/ardour/public_diskstream.h

@@ -33,8 +33,8 @@ public:
 	virtual ~PublicDiskstream() {}
 
 	virtual boost::shared_ptr<Playlist> playlist () = 0;
-	virtual void request_jack_monitors_input (bool) = 0;
-	virtual void ensure_jack_monitors_input (bool) = 0;
+	virtual void request_input_monitoring (bool) = 0;
+	virtual void ensure_input_monitoring (bool) = 0;
 	virtual bool destructive () const = 0;
 	virtual std::list<boost::shared_ptr<Source> > & last_capture_sources () = 0;
 	virtual void set_capture_offset () = 0;

libs/ardour/ardour/slave.h

@@ -363,7 +363,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);

libs/ardour/ardour/track.h

@@ -115,8 +115,8 @@ class Track : public Route, public PublicDiskstream
 
 	/* PublicDiskstream interface */
 	boost::shared_ptr<Playlist> playlist ();
-	void request_jack_monitors_input (bool);
-	void ensure_jack_monitors_input (bool);
+	void request_input_monitoring (bool);
+	void ensure_input_monitoring (bool);
 	bool destructive () const;
 	std::list<boost::shared_ptr<Source> > & last_capture_sources ();
 	void set_capture_offset ();

libs/ardour/ardour/types.h

@@ -28,8 +28,6 @@
 #include <stdint.h>
 
 #include <inttypes.h>
-#include <jack/types.h>
-#include <jack/midiport.h>
 
 #include "timecode/bbt_time.h"
 #include "timecode/time.h"
@@ -53,12 +51,12 @@ namespace ARDOUR {
 	class Route;
 	class Region;
 
-	typedef jack_default_audio_sample_t Sample;
-	typedef float                       pan_t;
-	typedef float                       gain_t;
-	typedef uint32_t                    layer_t;
-	typedef uint64_t                    microseconds_t;
-	typedef jack_nframes_t              pframes_t;
+	typedef float    Sample;
+	typedef float    pan_t;
+	typedef float    gain_t;
+	typedef uint32_t layer_t;
+	typedef uint64_t microseconds_t;
+	typedef uint32_t pframes_t;
 
 	/* Any position measured in audio frames.
 	   Assumed to be non-negative but not enforced.

libs/ardour/audio_track.cc

@@ -96,7 +96,7 @@ AudioTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
 	}
 
 	_diskstream->set_record_enabled (false);
-	_diskstream->request_jack_monitors_input (false);
+	_diskstream->request_input_monitoring (false);
 
 	DiskstreamChanged (); /* EMIT SIGNAL */
 }

libs/ardour/midi_diskstream.cc

@@ -1259,7 +1259,7 @@ MidiDiskstream::allocate_temporary_buffers ()
 }
 
 void
-MidiDiskstream::ensure_jack_monitors_input (bool yn)
+MidiDiskstream::ensure_input_monitoring (bool yn)
 {
 	boost::shared_ptr<MidiPort> sp = _source_port.lock ();
 	

libs/ardour/mtc_slave.cc

@@ -600,7 +600,7 @@ MTC_Slave::init_engine_dll (framepos_t pos, framepos_t inc)
 }
 
 /* main entry point from session_process.cc
- * in jack_process callback context */
+xo * in process callback context */
 bool
 MTC_Slave::speed_and_position (double& speed, framepos_t& pos)
 {

libs/ardour/port.cc

@@ -337,7 +337,7 @@ Port::get_connected_latency_range (LatencyRange& range, bool playback) const
 
 	if (!connections.empty()) {
 
-		range.min = ~((jack_nframes_t) 0);
+		range.min = ~((pframes_t) 0);
 		range.max = 0;
 
 		DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: %2 connections to check for latency range\n", name(), connections.size()));

libs/ardour/route.cc

@@ -3820,7 +3820,7 @@ Route::update_port_latencies (PortSet& from, PortSet& to, bool playback, framecn
 		all_connections.min = 0;
 		all_connections.max = 0;
 	} else {
-		all_connections.min = ~((jack_nframes_t) 0);
+		all_connections.min = ~((pframes_t) 0);
 		all_connections.max = 0;
 		
 		/* iterate over all "from" ports and determine the latency range for all of their

libs/ardour/session.cc

@@ -942,7 +942,7 @@ Session::set_track_monitor_input_status (bool yn)
 		boost::shared_ptr<AudioTrack> tr = boost::dynamic_pointer_cast<AudioTrack> (*i);
 		if (tr && tr->record_enabled ()) {
 			//cerr << "switching to input = " << !auto_input << __FILE__ << __LINE__ << endl << endl;
-			tr->request_jack_monitors_input (yn);
+			tr->request_input_monitoring (yn);
 		}
 	}
 }

libs/ardour/track.cc

@@ -550,15 +550,15 @@ Track::playlist ()
 }
 
 void
-Track::request_jack_monitors_input (bool m)
+Track::request_input_monitoring (bool m)
 {
-	_diskstream->request_jack_monitors_input (m);
+	_diskstream->request_input_monitoring (m);
 }
 
 void
-Track::ensure_jack_monitors_input (bool m)
+Track::ensure_input_monitoring (bool m)
 {
-	_diskstream->ensure_jack_monitors_input (m);
+	_diskstream->ensure_input_monitoring (m);
 }
 
 bool