Clarify ensure vs. request for JACK monitoring, naming-wise.

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

10 files changed, 20 insertions, 11 deletions

diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index afb6ecc908..be43142f21 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -114,7 +114,7 @@ class AudioDiskstream : public Diskstream
 	XMLNode& get_state(void);
 	int      set_state(const XMLNode& node, int version);
 
-	void monitor_input (bool);
+	void request_jack_monitors_input (bool);
 
 	static void swap_by_ptr (Sample *first, Sample *last) {
 		while (first < last) {
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 96bffae723..c512102656 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -132,7 +132,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
 	virtual XMLNode& get_state(void);
 	virtual int      set_state(const XMLNode&, int version);
 
-	virtual void monitor_input (bool) {}
+	virtual void request_jack_monitors_input (bool) {}
+	virtual void ensure_jack_monitors_input (bool) {}
 
 	framecnt_t   capture_offset() const { return _capture_offset; }
 	virtual void set_capture_offset ();
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index a7695b5ebf..94eb56d9b5 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -78,7 +78,7 @@ class MidiDiskstream : public Diskstream
 	XMLNode& get_state(void);
 	int set_state(const XMLNode&, int version);
 
-	void monitor_input (bool);
+	void ensure_jack_monitors_input (bool);
 
 	boost::shared_ptr<SMFSource> write_source ()    { return _write_source; }
 
diff --git a/libs/ardour/ardour/public_diskstream.h b/libs/ardour/ardour/public_diskstream.h
index 3dadf2e8be..da481a6dee 100755
--- a/libs/ardour/ardour/public_diskstream.h
+++ b/libs/ardour/ardour/public_diskstream.h
@@ -33,7 +33,8 @@ public:
 	virtual ~PublicDiskstream() {}
 
 	virtual boost::shared_ptr<Playlist> playlist () = 0;
-	virtual void monitor_input (bool) = 0;
+	virtual void request_jack_monitors_input (bool) = 0;
+	virtual void ensure_jack_monitors_input (bool) = 0;
 	virtual bool destructive () const = 0;
 	virtual std::list<boost::shared_ptr<Source> > & last_capture_sources () = 0;
 	virtual void set_capture_offset () = 0;
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 5e8ced7d42..8f68f63d05 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -109,7 +109,8 @@ class Track : public Route, public PublicDiskstream
 
 	/* PublicDiskstream interface */
 	boost::shared_ptr<Playlist> playlist ();
-	void monitor_input (bool);
+	void request_jack_monitors_input (bool);
+	void ensure_jack_monitors_input (bool);
 	bool destructive () const;
 	std::list<boost::shared_ptr<Source> > & last_capture_sources ();
 	void set_capture_offset ();
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index f096a463ef..603179a8e2 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -1973,7 +1973,7 @@ AudioDiskstream::allocate_temporary_buffers ()
 }
 
 void
-AudioDiskstream::monitor_input (bool yn)
+AudioDiskstream::request_jack_monitors_input (bool yn)
 {
 	boost::shared_ptr<ChannelList> c = channels.reader();
 
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 74be81c909..458738bddb 100644
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -100,7 +100,7 @@ AudioTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
 	}
 
 	_diskstream->set_record_enabled (false);
-	_diskstream->monitor_input (false);
+	_diskstream->request_jack_monitors_input (false);
 
 	DiskstreamChanged (); /* EMIT SIGNAL */
 }
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 093d77f19d..c1d391fa4a 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -1373,7 +1373,7 @@ MidiDiskstream::allocate_temporary_buffers ()
 }
 
 void
-MidiDiskstream::monitor_input (bool yn)
+MidiDiskstream::ensure_jack_monitors_input (bool yn)
 {
 	boost::shared_ptr<MidiPort> sp = _source_port.lock ();
 	
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index f2e224fee5..9a4b4f65ed 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -782,7 +782,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->monitor_input (yn);
+			tr->request_jack_monitors_input (yn);
 		}
 	}
 }
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index c0468c9af4..fa19c3ddcc 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -484,9 +484,15 @@ Track::playlist ()
 }
 
 void
-Track::monitor_input (bool m)
+Track::request_jack_monitors_input (bool m)
 {
-	_diskstream->monitor_input (m);
+	_diskstream->request_jack_monitors_input (m);
+}
+
+void
+Track::ensure_jack_monitors_input (bool m)
+{
+	_diskstream->ensure_jack_monitors_input (m);
 }
 
 bool