Towards MIDI:

- Converted vector<Sample*> to BufferList and numerous counts from int to ChanCount (and related changes)
- Added fancy type-generic iterators to BufferList, PortIterator (see IO::collect_input for a good example of the idea - the same code will work to read all input (of various types in a single IO, eg instruments) without modification no matter how many types we add)
- Fixed comparison operator bugs with ChanCount (screwed up metering among other things)
- Moved peak metering into it's own object, and moved most of the pan related code out of IO to panner (still a touch more to be done here for MIDI playback)

Not directly MIDI related fixes for problems in trunk:

- Fixed varispeed gain/pan automation to work properly (was reading the wrong range of automation data, probably causing nasty clicks?)
- Fixed crash on varispeed looping (possibly only a 64-bit problem).  It still doesn't work, but at least it doesn't die

Quite a few things broken, and the new classes are pretty filthy still, but I think the direction is a lot better than all my previous plans...


git-svn-id: svn://localhost/ardour2/branches/midi@795 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 5 deletions

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 493a5e7bc0..cf6b2b7c60 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -161,8 +161,11 @@ class Route : public IO
 		}
 	}
 	
-	uint32_t max_redirect_outs () const { return redirect_max_outs; }
-		
+	ChanCount max_redirect_outs () const { return redirect_max_outs; }
+	
+	// FIXME: remove/replace err_streams parameters with something appropriate
+	// they are used by 'wierd_plugin_dialog'(sic) to display the number of input streams
+	// at the insertion point if the insert fails
 	int add_redirect (boost::shared_ptr<Redirect>, void *src, uint32_t* err_streams = 0);
 	int add_redirects (const RedirectList&, void *src, uint32_t* err_streams = 0);
 	int remove_redirect (boost::shared_ptr<Redirect>, void *src, uint32_t* err_streams = 0);
@@ -304,7 +307,7 @@ class Route : public IO
 	void passthru (jack_nframes_t start_frame, jack_nframes_t end_frame, 
 		       jack_nframes_t nframes, jack_nframes_t offset, int declick, bool meter_inputs);
 
-	virtual void process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
+	virtual void process_output_buffers (BufferSet& bufs,
 				     jack_nframes_t start_frame, jack_nframes_t end_frame,
 				     jack_nframes_t nframes, jack_nframes_t offset, bool with_redirects, int declick,
 				     bool meter);
@@ -318,11 +321,11 @@ class Route : public IO
 	sigc::connection input_signal_connection;
 
 	state_id_t _current_state_id;
-	uint32_t redirect_max_outs;
+	ChanCount redirect_max_outs;
 	uint32_t _remote_control_id;
 
 	uint32_t pans_required() const;
-	uint32_t n_process_buffers ();
+	ChanCount n_process_buffers ();
 
   private:
 	void init ();