- 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, 2 insertions, 5 deletions

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index a866a9780a..14c5b920be 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -614,7 +614,7 @@ MixerStrip::add_connection_to_input_menu (ARDOUR::Connection* c)
 
 	MenuList& citems = input_menu.items();
 	
-	if (c->nports() == _route->n_inputs()) {
+	if (c->nports() == _route->n_inputs().get_total()) {
 
 		citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_input_chosen), c)));
 		
@@ -637,7 +637,7 @@ MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c)
 		return;
 	}
 
-	if (c->nports() == _route->n_outputs()) {
+	if (c->nports() == _route->n_outputs().get_total()) {
 
 		MenuList& citems = output_menu.items();
 		citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_output_chosen), c)));
@@ -1129,8 +1129,6 @@ MixerStrip::route_active_changed ()
 {
 	RouteUI::route_active_changed ();
 
-	// FIXME: MIDI/Audio bus distinction
-	
 	if (is_midi_track()) {
 		if (_route->active()) {
 			set_name ("MidiTrackStripBase");
@@ -1139,7 +1137,6 @@ MixerStrip::route_active_changed ()
 			set_name ("MidiTrackStripBaseInactive");
 			gpm.set_meter_strip_name ("MidiTrackStripBaseInactive");
 		}
-		gpm.set_fader_name ("MidiTrackFader");
 	} else if (is_audio_track()) {
 		if (_route->active()) {
 			set_name ("AudioTrackStripBase");