From 498dfebcca3b97cdd7b83444040042fe06626241 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 9 Nov 2009 20:05:18 +0000
Subject: 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
---
 libs/ardour/enums.cc | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'libs/ardour/enums.cc')

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 885ebeb27a..ed7ba88d8e 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -70,7 +70,7 @@ setup_enum_writer ()
 	CDMarkerFormat _CDMarkerFormat;
 	HeaderFormat _HeaderFormat;
 	PluginType _PluginType;
-	SlaveSource _SlaveSource;
+	SyncSource _SyncSource;
 	ShuttleBehaviour _ShuttleBehaviour;
 	ShuttleUnits _ShuttleUnits;
 	Session::RecordState _Session_RecordState;
@@ -266,11 +266,10 @@ setup_enum_writer ()
 	REGISTER_ENUM (VST);
 	REGISTER (_PluginType);
 
-	REGISTER_ENUM (None);
 	REGISTER_ENUM (MTC);
 	REGISTER_ENUM (JACK);
 	REGISTER_ENUM (MIDIClock);
-	REGISTER (_SlaveSource);
+	REGISTER (_SyncSource);
 
 	REGISTER_ENUM (Sprung);
 	REGISTER_ENUM (Wheel);
@@ -296,7 +295,7 @@ setup_enum_writer ()
 	REGISTER_CLASS_ENUM (Session::Event, RangeStop);
 	REGISTER_CLASS_ENUM (Session::Event, RangeLocate);
 	REGISTER_CLASS_ENUM (Session::Event, Overwrite);
-	REGISTER_CLASS_ENUM (Session::Event, SetSlaveSource);
+	REGISTER_CLASS_ENUM (Session::Event, SetSyncSource);
 	REGISTER_CLASS_ENUM (Session::Event, Audition);
 	REGISTER_CLASS_ENUM (Session::Event, InputConfigurationChange);
 	REGISTER_CLASS_ENUM (Session::Event, SetPlayAudioRange);
@@ -669,15 +668,15 @@ std::ostream& operator<<(std::ostream& o, const CrossfadeModel& var)
 	std::string s = enum_2_string (var);
 	return o << s;
 }
-std::istream& operator>>(std::istream& o, SlaveSource& var) 
+std::istream& operator>>(std::istream& o, SyncSource& var) 
 { 
 	std::string s;
 	o >> s;
-	var = (SlaveSource) string_2_enum (s, var);
+	var = (SyncSource) string_2_enum (s, var);
 	return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const SlaveSource& var) 
+std::ostream& operator<<(std::ostream& o, const SyncSource& var) 
 { 
 	std::string s = enum_2_string (var);
 	return o << s;
-- 
cgit v1.2.3