90% done with external sync design changes (GUI now has toggle switch for ext/int sync; source chosen separately, currently in ardour prefs dialog ; fix libmidi++ and compilation scripts to correctly build JACK+ALSA support; minor contiuing tweaks on transport stuff

git-svn-id: svn://localhost/ardour2/branches/3.0@6048 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 9 insertions, 16 deletions

diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc
index abed926983..af90c935c9 100644
--- a/libs/ardour/utils.cc
+++ b/libs/ardour/utils.cc
@@ -331,14 +331,10 @@ edit_mode_to_string (EditMode mode)
 	}
 }
 
-SlaveSource
-string_to_slave_source (string str)
+SyncSource
+string_to_sync_source (string str)
 {
-	if (str == _("Internal")) {
-		return None;
-	}
-
-	if (str == _("MTC")) {
+	if (str == _("MIDI Timecode")) {
 		return MTC;
 	}
 
@@ -350,29 +346,26 @@ string_to_slave_source (string str)
 		return JACK;
 	}
 
-	fatal << string_compose (_("programming error: unknown slave source string \"%1\""), str) << endmsg;
+	fatal << string_compose (_("programming error: unknown sync source string \"%1\""), str) << endmsg;
 	/*NOTREACHED*/
-	return None;
+	return JACK;
 }
 
 const char*
-slave_source_to_string (SlaveSource src)
+sync_source_to_string (SyncSource src)
 {
 	switch (src) {
 	case JACK:
 		return _("JACK");
 
 	case MTC:
-		return _("MTC");
+		return _("MIDI Timecode");
 
 	case MIDIClock:
 		return _("MIDI Clock");
-
-	default:
-	case None:
-		return _("Internal");
-
 	}
+	/* GRRRR .... stupid, stupid gcc - you can't get here from there, all enum values are handled */
+	return _("JACK");
 }
 
 float