remove GTKOSX_PREFIX from scons; MIDI/MMC fix from Chris G; fix crash when starting without ALSA sequencer loaded in kernel

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2340 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 8 deletions

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index c7b1b92cb8..199d69d42a 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -110,9 +110,8 @@ static int
 setup_midi ()
 {
 	std::map<string,Configuration::MidiPortDescriptor*>::iterator i;
-	int nports;
-
-	if ((nports = Config->midi_ports.size()) == 0) {
+	
+	if (Config->midi_ports.size() == 0) {
 		warning << _("no MIDI ports specified: no MMC or MTC control possible") << endmsg;
 		return 0;
 	}
@@ -133,15 +132,14 @@ setup_midi ()
 		}
 		
 		MIDI::Manager::instance()->add_port (request);
-
-		nports++;
 	}
 
 	MIDI::Port* first;
 	const MIDI::Manager::PortMap& ports = MIDI::Manager::instance()->get_midi_ports();
-	first = ports.begin()->second;
 
-	if (nports > 1) {
+	if (ports.size() > 1) {
+
+		first = ports.begin()->second;
 
 		/* More than one port, so try using specific names for each port */
 
@@ -173,7 +171,9 @@ setup_midi ()
 			default_midi_port = first;
 		}
 		
-	} else {
+	} else if (ports.size() == 1) {
+
+		first = ports.begin()->second;
 
 		/* Only one port described, so use it for both MTC and MMC */