4 files changed, 9 insertions, 21 deletions

diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index e93ebd7f02..945dc52b31 100644
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -37,9 +37,6 @@ class LIBARDOUR_API AudioTrack : public Track
 	AudioTrack (Session&, std::string name, TrackMode m = Normal);
 	~AudioTrack ();
 
-	int roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample,
-	          int declick, bool& need_butler);
-
 	void freeze_me (InterThreadInfo&);
 	void unfreeze ();
 
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index 54a04d8ed3..023c18926b 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -42,8 +42,6 @@ public:
 
 	int init ();
 
-	int roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, int declick, bool& need_butler);
-
 	void realtime_locate ();
 	void non_realtime_locate (samplepos_t);
 
@@ -120,6 +118,8 @@ public:
 	MidiChannelFilter& playback_filter() { return _playback_filter; }
 	MidiChannelFilter& capture_filter()  { return _capture_filter; }
 
+	virtual void filter_input (BufferSet& bufs);
+
 	boost::shared_ptr<MidiPlaylist> midi_playlist ();
 
 	PBD::Signal1<void, boost::weak_ptr<MidiSource> > DataRecorded;
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 1ecf36d445..0e1d0b65e1 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -77,6 +77,7 @@ class PluginInsert;
 class RouteGroup;
 class Send;
 class InternalReturn;
+class MonitorControl;
 class MonitorProcessor;
 class Pannable;
 class CapturingProcessor;
@@ -128,11 +129,15 @@ public:
 	bool set_name (const std::string& str);
 	static void set_name_in_state (XMLNode &, const std::string &, bool rename_playlist = true);
 
+	boost::shared_ptr<MonitorControl> monitoring_control() const { return _monitoring_control; }
+
 	MonitorState monitoring_state () const;
 	virtual MeterState metering_state () const;
 
 	/* these are the core of the API of a Route. see the protected sections as well */
 
+	virtual void filter_input (BufferSet &) {}
+
 	virtual int roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample,
 	                  int declick, bool& need_butler);
 
@@ -474,13 +479,6 @@ public:
 		return _solo_safe_control;
 	}
 
-	boost::shared_ptr<MonitorControl> monitoring_control() const {
-		/* tracks override this to provide actual monitoring control;
-		   busses have no possible choices except input monitoring.
-		*/
-		return boost::shared_ptr<MonitorControl> ();
-	}
-
 	/* Route doesn't own these items, but sub-objects that it does own have them
 	   and to make UI code a bit simpler, we provide direct access to them
 	   here.
@@ -603,7 +601,7 @@ public:
 
 	void fill_buffers_with_input (BufferSet& bufs, boost::shared_ptr<IO> io, pframes_t nframes);
 
-	void passthru (BufferSet&, samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes, int declick);
+	void passthru (BufferSet&, samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes, int declick, bool gain_automation_ok);
 
 	virtual void write_out_of_band_data (BufferSet& /* bufs */, samplepos_t /* start_sample */, samplepos_t /* end_sample */,
 					     samplecnt_t /* nframes */) {}
@@ -640,6 +638,7 @@ public:
 	boost::shared_ptr<Pannable> _pannable;
 	boost::shared_ptr<DiskReader> _disk_reader;
 	boost::shared_ptr<DiskWriter> _disk_writer;
+	boost::shared_ptr<MonitorControl> _monitoring_control;
 
 	DiskIOPoint    _disk_io_point;
 
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 9d00f812d3..ec81e92939 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -38,7 +38,6 @@ class DiskReader;
 class DiskWriter;
 class IO;
 class Location;
-class MonitorControl;
 class RecordEnableControl;
 class RecordSafeControl;
 
@@ -62,9 +61,6 @@ class LIBARDOUR_API Track : public Route, public Recordable
 
 	TrackMode mode () const { return _mode; }
 
-	boost::shared_ptr<MonitorControl> monitoring_control() const { return _monitoring_control; }
-
-	MonitorState monitoring_state () const;
 	MeterState metering_state () const;
 
 	bool set_processor_state (XMLNode const & node, XMLProperty const* prop, ProcessorList& new_order, bool& must_configure);
@@ -72,9 +68,6 @@ class LIBARDOUR_API Track : public Route, public Recordable
 	virtual int no_roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample,
 	                     bool state_changing);
 
-	virtual int roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample,
-	                  int declick, bool& need_butler) = 0;
-
 	bool needs_butler() const { return _needs_butler; }
 
 	bool can_record();
@@ -197,7 +190,6 @@ class LIBARDOUR_API Track : public Route, public Recordable
 	MeterPoint    _saved_meter_point;
 	TrackMode     _mode;
 	bool          _needs_butler;
-	boost::shared_ptr<MonitorControl> _monitoring_control;
 
 	//private: (FIXME)
 	struct FreezeRecordProcessorInfo {