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, 9 insertions, 8 deletions

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 5cffe8a7c6..cac27168a1 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -73,6 +73,7 @@ class Route;
 class AuxInput;
 class Source;
 class AudioSource;
+class BufferSet;
 
 class Diskstream;
 class AudioDiskstream;
@@ -280,10 +281,10 @@ class Session : public sigc::trackable, public Stateful
 
 	void process (jack_nframes_t nframes);
 
-	vector<Sample*>& get_passthru_buffers() { return _passthru_buffers; }
-	vector<Sample*>& get_silent_buffers (uint32_t howmany);
-	vector<Sample*>& get_send_buffers () { return _send_buffers; }
-
+	BufferSet& get_silent_buffers (ChanCount count = ChanCount::ZERO);
+	BufferSet& get_scratch_buffers (ChanCount count = ChanCount::ZERO);
+	BufferSet& get_send_buffers (ChanCount count = ChanCount::ZERO);
+	
 	Diskstream    *diskstream_by_id (const PBD::ID& id);
 	Diskstream    *diskstream_by_name (string name);
 
@@ -1072,9 +1073,9 @@ class Session : public sigc::trackable, public Stateful
 	jack_nframes_t          _last_slave_transport_frame;
 	jack_nframes_t           maximum_output_latency;
 	jack_nframes_t           last_stop_frame;
-	vector<Sample *>        _passthru_buffers;
-	vector<Sample *>        _silent_buffers;
-	vector<Sample *>        _send_buffers;
+	BufferSet*              _scratch_buffers;
+	BufferSet*              _silent_buffers;
+	BufferSet*              _send_buffers;
 	jack_nframes_t           current_block_size;
 	jack_nframes_t          _worst_output_latency;
 	jack_nframes_t          _worst_input_latency;
@@ -1091,7 +1092,7 @@ class Session : public sigc::trackable, public Stateful
 
 	void update_latency_compensation_proxy (void* ignored);
 
-	void ensure_passthru_buffers (ChanCount howmany);
+	void ensure_buffers (ChanCount howmany);
 	
 	void process_scrub          (jack_nframes_t);
 	void process_without_events (jack_nframes_t);