Remove unused rec_monitors_input variables.

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

9 files changed, 13 insertions, 26 deletions

diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index e37963a07a..f233e21112 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -171,7 +171,7 @@ class AudioDiskstream : public Diskstream
   protected:
 	friend class AudioTrack;
 
-	int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler);
+	int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool& need_butler);
 	bool commit  (framecnt_t nframes);
 
   private:
@@ -237,7 +237,7 @@ class AudioDiskstream : public Diskstream
 	          framepos_t& start, framecnt_t cnt,
 	          ChannelInfo* channel_info, int channel, bool reversed);
 
-	void finish_capture (bool rec_monitors_input, boost::shared_ptr<ChannelList>);
+	void finish_capture (boost::shared_ptr<ChannelList>);
 	void transport_stopped_wallclock (struct tm&, time_t, bool abort);
 	void transport_looped (framepos_t transport_frame);
 
diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index 7a2c50099f..445558ccdd 100644
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -40,7 +40,7 @@ class AudioTrack : public Track
 	bool can_use_mode (TrackMode m, bool& bounce_required);
 
 	int roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-	          int declick, bool can_record, bool rec_monitors_input, bool& need_butler);
+	          int declick, bool can_record, bool& need_butler);
 
 	void use_new_diskstream ();
 	void set_diskstream (boost::shared_ptr<Diskstream>);
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 808ad38625..dad9501c8e 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -185,7 +185,7 @@ class Diskstream : public SessionObject, public PublicDiskstream
   protected:
 	friend class Track;
 
-	virtual int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler) = 0;
+	virtual int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool& need_butler) = 0;
 	virtual bool commit  (framecnt_t nframes) = 0;
 
 	//private:
diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h
index e3363a0353..0279fe8fd9 100644
--- a/libs/ardour/ardour/graph.h
+++ b/libs/ardour/ardour/graph.h
@@ -74,10 +74,10 @@ public:
 	void main_thread();
 
 	int silent_process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-	                           bool can_record, bool rec_monitors_input, bool& need_butler);
+	                           bool can_record, bool& need_butler);
 
 	int process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick,
-	                    bool can_record, bool rec_monitors_input, bool& need_butler);
+	                    bool can_record, bool& need_butler);
 
 	int routes_no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 	                    bool non_rt_pending, bool can_record, int declick);
@@ -131,7 +131,6 @@ private:
 	framepos_t _process_start_frame;
 	framepos_t _process_end_frame;
 	bool	   _process_can_record;
-	bool	   _process_rec_monitors_input;
 	bool	   _process_non_rt_pending;
 	int        _process_declick;
 
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index b7f3de3887..d10640b51b 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -142,7 +142,7 @@ class MidiDiskstream : public Diskstream
   protected:
 	friend class MidiTrack;
 
-	int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler);
+	int  process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool& need_butler);
 	bool commit  (framecnt_t nframes);
 	static framecnt_t midi_readahead;
 
@@ -156,7 +156,7 @@ class MidiDiskstream : public Diskstream
 
 	int read (framepos_t& start, framecnt_t cnt, bool reversed);
 
-	void finish_capture (bool rec_monitors_input);
+	void finish_capture ();
 	void transport_stopped_wallclock (struct tm&, time_t, bool abort);
 	void transport_looped (framepos_t transport_frame);
 
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index ab8f045faa..407a317433 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -42,7 +42,7 @@ public:
 	int init ();
 
 	int roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-	          int declick, bool can_record, bool rec_monitors_input, bool& need_butler);
+	          int declick, bool can_record, bool& need_butler);
 
 	void realtime_handle_transport_stopped ();
 	void realtime_locate ();
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 1d8c39a21e..34ecffa29c 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -109,13 +109,13 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
 	/* these are the core of the API of a Route. see the protected sections as well */
 
 	virtual int roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-	                  int declick, bool can_record, bool rec_monitors_input, bool& need_butler);
+	                  int declick, bool can_record, bool& need_butler);
 
 	virtual int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 	                     bool state_changing, bool can_record);
 
 	virtual int silent_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-	                         bool can_record, bool rec_monitors_input, bool& need_butler);
+	                         bool can_record, bool& need_butler);
 
 	virtual void toggle_monitor_input ();
 	virtual bool can_record() { return false; }
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index cafcd4382f..68cf66bd25 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -963,18 +963,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	int  process_routes (pframes_t, bool& need_butler);
 	int  silent_process_routes (pframes_t, bool& need_butler);
 
-	bool get_rec_monitors_input () {
-		if (actively_recording()) {
-			return true;
-		} else {
-			if (config.get_auto_input()) {
-				return false;
-			} else {
-				return true;
-			}
-		}
-	}
-
 	int get_transport_declick_required () {
 		if (transport_sub_state & PendingDeclickIn) {
 			transport_sub_state &= ~PendingDeclickIn;
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index b58b5a3b77..d245977978 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -52,10 +52,10 @@ class Track : public Route, public PublicDiskstream
 	                     bool state_changing, bool can_record);
 
 	int silent_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-	                 bool can_record, bool rec_monitors_input, bool& need_butler);
+	                 bool can_record, bool& need_butler);
 
 	virtual int roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
-	                  int declick, bool can_record, bool rec_monitors_input, bool& need_butler) = 0;
+	                  int declick, bool can_record, bool& need_butler) = 0;
 
 	bool needs_butler() const { return _needs_butler; }
 	void toggle_monitor_input ();