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, 18 deletions

diff --git a/libs/ardour/ardour/chan_count.h b/libs/ardour/ardour/chan_count.h
index 67ad5406e3..26e41a9bcd 100644
--- a/libs/ardour/ardour/chan_count.h
+++ b/libs/ardour/ardour/chan_count.h
@@ -73,41 +73,31 @@ public:
 	bool operator<(const ChanCount& other) const
 	{
 		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-			if (_counts[(*t).to_index()] >= other._counts[(*t).to_index()]) {
+			if (_counts[(*t).to_index()] > other._counts[(*t).to_index()]) {
 				return false;
 			}
 		}
-		return true;
+		return (*this != other);
 	}
-	
+
 	bool operator<=(const ChanCount& other) const
 	{
-		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-			if (_counts[(*t).to_index()] > other._counts[(*t).to_index()]) {
-				return false;
-			}
-		}
-		return true;
+		return ( (*this < other) || (*this == other) );
 	}
 	
 	bool operator>(const ChanCount& other) const
 	{
 		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-			if (_counts[(*t).to_index()] <= other._counts[(*t).to_index()]) {
+			if (_counts[(*t).to_index()] < other._counts[(*t).to_index()]) {
 				return false;
 			}
 		}
-		return true;
+		return (*this != other);
 	}
-	
+
 	bool operator>=(const ChanCount& other) const
 	{
-		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-			if (_counts[(*t).to_index()] < other._counts[(*t).to_index()]) {
-				return false;
-			}
-		}
-		return true;
+		return ( (*this > other) || (*this == other) );
 	}
 
 	static const ChanCount INFINITE;