- Replaced integer port counts (and input/output maximum/minimum) with ChanCount, which can count multiple types and does the reasonable thing for all comparison operators

- Removed the fader/meters from MIDI mixer strips, at least until they do something
- Made the Add Route dialog refuse to create MIDI busses, Spifftacular warning dialog and all

Changes a bit more widespread than I was hoping, but worked out really well - lots of code will continue to work fine even when multi-typed (eg instrument) IOs come around, just ignoring the types it doesn't care about.  Most all changes related to counts are little search/replace deals, logic doesn't need to change.  Hopefully SVN can handle (automatic) merging with the other SoC projects if the buffer change goes as well.

Next step: do for buffers what the last two commits did for ports.


git-svn-id: svn://localhost/ardour2/branches/midi@787 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 4 insertions, 4 deletions

diff --git a/libs/ardour/ardour/port_set.h b/libs/ardour/ardour/port_set.h
index f8975325a0..d38aab2c4b 100644
--- a/libs/ardour/ardour/port_set.h
+++ b/libs/ardour/ardour/port_set.h
@@ -60,7 +60,7 @@ public:
 
 	const ChanCount& chan_count() const { return _chan_count; }
 
-	bool empty() const { return (_chan_count.get_total_count() == 0); }
+	bool empty() const { return (_chan_count.get_total() == 0); }
 
 	// ITERATORS
 	
@@ -85,7 +85,7 @@ public:
 	};
 
 	iterator begin() { return iterator(*this, 0); }
-	iterator end()   { return iterator(*this, _chan_count.get_total_count()); }
+	iterator end()   { return iterator(*this, _chan_count.get_total()); }
 	
 	class const_iterator {
 	public:
@@ -105,7 +105,7 @@ public:
 	};
 
 	const_iterator begin() const { return const_iterator(*this, 0); }
-	const_iterator end()   const { return const_iterator(*this, _chan_count.get_total_count()); }
+	const_iterator end()   const { return const_iterator(*this, _chan_count.get_total()); }
 
 	
 
@@ -127,7 +127,7 @@ public:
 	};
 
 	audio_iterator audio_begin() { return audio_iterator(*this, 0); }
-	audio_iterator audio_end()   { return audio_iterator(*this, _chan_count.get_count(DataType::AUDIO)); }
+	audio_iterator audio_end()   { return audio_iterator(*this, _chan_count.get(DataType::AUDIO)); }