First part of consolidating ::roll(), ::no_roll()

This moves common code (get and fill buffers) into ::passthru()
and renames ::passthru() to ::run_route().

passthru_silence() is no longer used (it was only needed A5 style
Track::no_roll_unlocked for no-roll + disk-monitoring)

1 files changed, 3 insertions, 7 deletions

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 83de9c6753..1437fd79ed 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -597,10 +597,6 @@ protected:
 
 	virtual int no_roll_unlocked (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool session_state_changing);
 
-	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, bool gain_automation_ok, bool run_disk_reader);
-
 	virtual void write_out_of_band_data (BufferSet& /* bufs */, samplepos_t /* start_sample */, samplepos_t /* end_sample */, samplecnt_t /* nframes */) {}
 
 	void process_output_buffers (BufferSet& bufs,
@@ -680,9 +676,6 @@ protected:
 
 	int configure_processors (ProcessorStreams*);
 
-	void passthru_silence (samplepos_t start_sample, samplepos_t end_sample,
-	                       pframes_t nframes, int declick);
-
 	void silence (samplecnt_t);
 	void silence_unlocked (samplecnt_t);
 
@@ -747,6 +740,9 @@ private:
 
 	pframes_t latency_preroll (pframes_t nframes, samplepos_t& start_sample, samplepos_t& end_sample);
 
+	void run_route (samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes, int declick, bool gain_automation_ok, bool run_disk_reader);
+	void fill_buffers_with_input (BufferSet& bufs, boost::shared_ptr<IO> io, pframes_t nframes);
+
 	void reset_instrument_info ();
 	void solo_control_changed (bool self, PBD::Controllable::GroupControlDisposition);
 	void maybe_note_meter_position ();