- 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/redirect.h b/libs/ardour/ardour/redirect.h
index 658cab5d3b..4e6ef5124c 100644
--- a/libs/ardour/ardour/redirect.h
+++ b/libs/ardour/ardour/redirect.h
@@ -70,10 +70,10 @@ class Redirect : public IO
 	bool active () const { return _active; }
 	void set_active (bool yn, void *src);
 
-	virtual uint32_t output_streams() const { return n_outputs(); }
-	virtual uint32_t input_streams () const { return n_inputs(); }
-	virtual uint32_t natural_output_streams() const { return n_outputs(); }
-	virtual uint32_t natural_input_streams () const { return n_inputs(); }
+	virtual uint32_t output_streams() const { return n_outputs().get(_default_type); }
+	virtual uint32_t input_streams () const { return n_inputs().get(_default_type); }
+	virtual uint32_t natural_output_streams() const { return n_outputs().get(_default_type); }
+	virtual uint32_t natural_input_streams () const { return n_inputs().get(_default_type); }
 
 	uint32_t sort_key() const { return _sort_key; }
 	void set_sort_key (uint32_t key);