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, 6 insertions, 4 deletions

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index db5296db3d..af3072d215 100644
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -55,6 +55,8 @@ Auditioner::Auditioner (Session& s)
 
 	allow_pan_reset ();
 	
+	reset_panner ();
+
 	IO::output_changed.connect (mem_fun (*this, &Auditioner::output_changed));
 
 	the_region = 0;
@@ -93,7 +95,7 @@ Auditioner::audition_current_playlist ()
 
 	/* force a panner reset now that we have all channels */
 
-	_panner->reset (n_outputs().get(DataType::AUDIO), _diskstream->n_channels());
+	_panner->reset (n_outputs().get(DataType::AUDIO), _diskstream->n_channels().get(DataType::AUDIO));
 
 	g_atomic_int_set (&_active, 1);
 }
@@ -116,17 +118,17 @@ Auditioner::audition_region (AudioRegion& region)
 	_diskstream->playlist()->clear (true, false);
 	_diskstream->playlist()->add_region (*the_region, 0, 1, false);
 
-	while (_diskstream->n_channels() < the_region->n_channels()) {
+	while (_diskstream->n_channels().get(DataType::AUDIO) < the_region->n_channels()) {
 		audio_diskstream().add_channel ();
 	}
 
-	while (_diskstream->n_channels() > the_region->n_channels()) {
+	while (_diskstream->n_channels().get(DataType::AUDIO) > the_region->n_channels()) {
 		audio_diskstream().remove_channel ();
 	}
 
 	/* force a panner reset now that we have all channels */
 
-	_panner->reset (n_outputs().get(DataType::AUDIO), _diskstream->n_channels());
+	reset_panner();
 
 	length = the_region->length();
 	_diskstream->seek (0);