- 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, 8 insertions, 3 deletions

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index aa61cb2525..4a2c3d2a2a 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -159,11 +159,16 @@ AddRouteDialog::track ()
 	return track_button.get_active ();
 }
 
-bool
-AddRouteDialog::midi ()
+ARDOUR::DataType
+AddRouteDialog::type ()
 {
+	// FIXME: ew
+	
 	const string str = channel_combo.get_active_text();
-	return (str == _("MIDI"));
+	if (str == _("MIDI"))
+		return ARDOUR::DataType::MIDI;
+	else
+		return ARDOUR::DataType::AUDIO;
 }
 
 string