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, 5 insertions, 5 deletions

diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index 0a068e8af0..426ff5deed 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -40,7 +40,7 @@ class Send : public Redirect {
 	Send (const Send&);
 	~Send ();
 	
-	void run (vector<Sample *> &bufs, uint32_t nbufs, jack_nframes_t nframes, jack_nframes_t offset);
+	void run (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset);
 	void activate() {}
 	void deactivate () {}
 
@@ -50,12 +50,12 @@ class Send : public Redirect {
 	XMLNode& get_state(void);
 	int set_state(const XMLNode& node);
 
-	uint32_t pans_required() const { return expected_inputs; }
-	void expect_inputs (uint32_t);
+	uint32_t pans_required() const { return _expected_inputs.get(DataType::AUDIO); }
+	void expect_inputs (const ChanCount&);
 
   private:
-	bool _metering;
-	uint32_t expected_inputs;
+	bool      _metering;
+	ChanCount _expected_inputs;
 };
 
 } // namespace ARDOUR