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

6 files changed, 16 insertions, 10 deletions

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index f675bf9eed..acde408c6b 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -767,7 +767,7 @@ AudioRegionView::create_waves ()
 		return;
 	}
 
-	uint32_t nchans = atv.get_diskstream()->n_channels();
+	uint32_t nchans = atv.get_diskstream()->n_channels().get(DataType::AUDIO);
 	
 	/* in tmp_waves, set up null pointers for each channel so the vector is allocated */
 	for (uint32_t n = 0; n < nchans; ++n) {
@@ -806,7 +806,7 @@ void
 AudioRegionView::create_one_wave (uint32_t which, bool direct)
 {
 	RouteTimeAxisView& atv (*(dynamic_cast<RouteTimeAxisView*>(&trackview))); // ick
-	uint32_t nchans = atv.get_diskstream()->n_channels();
+	uint32_t nchans = atv.get_diskstream()->n_channels().get(DataType::AUDIO);
 	uint32_t n;
 	uint32_t nwaves = std::min (nchans, audio_region().n_channels());
 	gdouble ht;
@@ -1024,7 +1024,7 @@ AudioRegionView::add_ghost (AutomationTimeAxisView& atv)
 	GhostRegion* ghost = new GhostRegion (atv, unit_position);
 	uint32_t nchans;
 	
-	nchans = rtv->get_diskstream()->n_channels();
+	nchans = rtv->get_diskstream()->n_channels().get(DataType::AUDIO);
 
 	for (uint32_t n = 0; n < nchans; ++n) {
 		
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 82349947c6..2e82d48ff3 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -402,7 +402,7 @@ AudioStreamView::setup_rec_box ()
 				AudioDiskstream* ads = dynamic_cast<AudioDiskstream*>(_trackview.get_diskstream());
 				assert(ads);
 
-				for (uint32_t n=0; n < ads->n_channels(); ++n) {
+				for (uint32_t n=0; n < ads->n_channels().get(DataType::AUDIO); ++n) {
 					AudioSource *src = (AudioSource *) ads->write_source (n);
 					if (src) {
 						sources.push_back (src);
@@ -553,7 +553,7 @@ AudioStreamView::rec_peak_range_ready (jack_nframes_t start, jack_nframes_t cnt,
 
 	rec_peak_ready_map[src] = true;
 
-	if (rec_peak_ready_map.size() == _trackview.get_diskstream()->n_channels()) {
+	if (rec_peak_ready_map.size() == _trackview.get_diskstream()->n_channels().get(DataType::AUDIO)) {
 		this->update_rec_regions ();
 		rec_peak_ready_map.clear();
 	}
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 3488c756ac..b3735cf42a 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -77,6 +77,7 @@ namespace ARDOUR {
 	class Session;
 	class AudioFilter;
 	class Crossfade;
+	class ChanCount;
 }
 
 namespace LADSPA {
@@ -1591,7 +1592,7 @@ class Editor : public PublicEditor
 	void external_edit_region ();
 
 	int write_audio_selection (TimeSelection&);
-	bool write_audio_range (ARDOUR::AudioPlaylist&, uint32_t channels, list<ARDOUR::AudioRange>&);
+	bool write_audio_range (ARDOUR::AudioPlaylist&, const ARDOUR::ChanCount& channels, list<ARDOUR::AudioRange>&);
 
 	void write_selection ();
 
@@ -1599,7 +1600,8 @@ class Editor : public PublicEditor
 
 	UndoAction get_memento() const;
 
-        XMLNode *before; /* used in *_reversible_command */
+	XMLNode *before; /* used in *_reversible_command */
+
 	void begin_reversible_command (string cmd_name);
 	void commit_reversible_command ();
 
diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 70c4863fd3..ec4727ad04 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -41,6 +41,7 @@
 #include <ardour/audio_diskstream.h>
 #include <ardour/audioregion.h>
 #include <ardour/audioplaylist.h>
+#include <ardour/chan_count.h>
 
 #include "i18n.h"
 
@@ -302,7 +303,7 @@ Editor::write_audio_selection (TimeSelection& ts)
 }
 
 bool
-Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<AudioRange>& range)
+Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list<AudioRange>& range)
 {
 	AudioFileSource* fs;
 	const jack_nframes_t chunk_size = 4096;
@@ -315,6 +316,8 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
 	string path;
 	vector<AudioFileSource *> sources;
 
+	uint32_t channels = count.get(DataType::AUDIO);
+
 	for (uint32_t n=0; n < channels; ++n) {
 		
 		for (cnt = 0; cnt < 999999; ++cnt) {
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index ea7663da8a..695a5d2be3 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -43,6 +43,7 @@
 
 #include <ardour/session.h>
 #include <ardour/route.h>
+#include <ardour/meter.h>
 
 #include "i18n.h"
 
@@ -326,7 +327,7 @@ GainMeter::update_meters ()
 	
 	for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
 		if ((*i).packed) {
-			peak = _io->peak_input_power (n);
+			peak = _io->peak_meter().peak_power (n);
 
 			(*i).meter->set (log_meter (peak), peak);
 						
diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index 2c645d8ed1..92d0770bd8 100644
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -448,7 +448,7 @@ RedirectBox::choose_send ()
 
 	/* XXX need redirect lock on route */
 
-	send->ensure_io (0, _route->max_redirect_outs(), false, this);
+	send->ensure_io (ChanCount::ZERO, _route->max_redirect_outs(), false, this);
 	
 	IOSelectorWindow *ios = new IOSelectorWindow (_session, send, false, true);