X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fenums.cc;h=c2a2a328018c7edc18b2aabc8043530772bb4ba3;hb=e12e8716ba10ba337e298739cf59b401df805ae1;hp=85634640b95ddb7a0311557a021747dd35638328;hpb=653ae4acd639fef149314fe6f8c7a0d862afae40;p=ardour.git

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 85634640b9..c2a2a32801 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -31,7 +31,9 @@
 #include "ardour/io.h"
 #include "ardour/location.h"
 #include "ardour/midi_model.h"
+#include "ardour/mode.h"
 #include "ardour/mute_master.h"
+#include "ardour/presentation_info.h"
 #include "ardour/session.h"
 #include "ardour/source.h"
 #include "ardour/tempo.h"
@@ -61,6 +63,7 @@ setup_enum_writer ()
 	NoteMode _NoteMode;
 	ChannelMode _ChannelMode;
 	ColorMode _ColorMode;
+	LocaleMode _LocaleMode;
 	MeterFalloff _MeterFalloff;
 	MeterHold _MeterHold;
 	VUMeterStandard _VUMeterStandard;
@@ -73,7 +76,6 @@ setup_enum_writer ()
 	MonitorState _MonitorState;
 	PFLPosition _PFLPosition;
 	AFLPosition _AFLPosition;
-	RemoteModel _RemoteModel;
 	DenormalModel _DenormalModel;
 	LayerModel _LayerModel;
 	InsertMergePolicy _InsertMergePolicy;
@@ -99,7 +101,6 @@ setup_enum_writer ()
 	AutoConnectOption _AutoConnectOption;
 	TracksAutoNamingRule _TracksAutoNamingRule;
 	Session::StateOfTheState _Session_StateOfTheState;
-	Route::Flag _Route_Flag;
 	Source::Flag _Source_Flag;
 	Diskstream::Flag _Diskstream_Flag;
 	Location::Flags _Location_Flags;
@@ -134,6 +135,9 @@ setup_enum_writer ()
 	Evoral::OverlapType _OverlapType;
         BufferingPreset _BufferingPreset;
 	AutoReturnTarget _AutoReturnTarget;
+	PresentationInfo::Flag _PresentationInfo_Flag;
+	MusicalMode::Type mode;
+	MidiPortFlags _MidiPortFlags;
 
 #define REGISTER(e) enum_writer.register_distinct (typeid(e).name(), i, s); i.clear(); s.clear()
 #define REGISTER_BITS(e) enum_writer.register_bits (typeid(e).name(), i, s); i.clear(); s.clear()
@@ -157,6 +161,7 @@ setup_enum_writer ()
 	REGISTER_ENUM (MidiPgmChangeAutomation);
 	REGISTER_ENUM (MidiPitchBenderAutomation);
 	REGISTER_ENUM (MidiChannelPressureAutomation);
+	REGISTER_ENUM (MidiNotePressureAutomation);
 	REGISTER_ENUM (MidiSystemExclusiveAutomation);
 	REGISTER_ENUM (FadeInAutomation);
 	REGISTER_ENUM (FadeOutAutomation);
@@ -243,6 +248,11 @@ setup_enum_writer ()
 	REGISTER_ENUM (TrackColor);
 	REGISTER (_ColorMode);
 
+	REGISTER_ENUM (SET_LC_ALL);
+	REGISTER_ENUM (SET_LC_MESSAGES);
+	REGISTER_ENUM (SET_LC_MESSAGES_AND_LC_NUMERIC);
+	REGISTER (_LocaleMode);
+
 	REGISTER_ENUM (MeterFalloffOff);
 	REGISTER_ENUM (MeterFalloffSlowest);
 	REGISTER_ENUM (MeterFalloffSlow);
@@ -322,9 +332,6 @@ setup_enum_writer ()
 	REGISTER_ENUM (DenormalFTZDAZ);
 	REGISTER (_DenormalModel);
 
-	REGISTER_ENUM (UserOrdered);
-	REGISTER_ENUM (MixerOrdered);
-	REGISTER (_RemoteModel);
 	/*
 	 * EditorOrdered has been deprecated
 	 * since the removal of independent
@@ -379,8 +386,11 @@ setup_enum_writer ()
 
 	REGISTER_ENUM (AudioUnit);
 	REGISTER_ENUM (LADSPA);
+	REGISTER_ENUM (LV2);
 	REGISTER_ENUM (Windows_VST);
 	REGISTER_ENUM (LXVST);
+	REGISTER_ENUM (MacVST);
+	REGISTER_ENUM (Lua);
 	REGISTER (_PluginType);
 
 	REGISTER_ENUM (MTC);
@@ -491,11 +501,6 @@ setup_enum_writer ()
 	REGISTER_CLASS_ENUM (Session, pullup_Minus4Minus1);
 	REGISTER (_Session_PullupFormat);
 
-	REGISTER_CLASS_ENUM (Route, Auditioner);
-	REGISTER_CLASS_ENUM (Route, MasterOut);
-	REGISTER_CLASS_ENUM (Route, MonitorOut);
-	REGISTER_BITS (_Route_Flag);
-
 	REGISTER_CLASS_ENUM (Source, Writable);
 	REGISTER_CLASS_ENUM (Source, CanRename);
 	REGISTER_CLASS_ENUM (Source, Broadcast);
@@ -679,6 +684,11 @@ setup_enum_writer ()
 	REGISTER_CLASS_ENUM (MidiModel::PatchChangeDiffCommand, Bank);
 	REGISTER (_MidiModel_PatchChangeDiffCommand_Property);
 
+	REGISTER_ENUM(MidiPortMusic);
+	REGISTER_ENUM(MidiPortControl);
+	REGISTER_ENUM(MidiPortSelection);
+	REGISTER_BITS(_MidiPortFlags);
+
 	REGISTER_ENUM(Linear);
 	REGISTER_ENUM(Logarithmic);
 	REGISTER(_WaveformScale);
@@ -709,6 +719,58 @@ setup_enum_writer ()
 	REGISTER_ENUM (Loop);
 	REGISTER_ENUM (RegionSelectionStart);
 	REGISTER_BITS (_AutoReturnTarget);
+
+	REGISTER_CLASS_ENUM (PresentationInfo, AudioTrack);
+	REGISTER_CLASS_ENUM (PresentationInfo, MidiTrack);
+	REGISTER_CLASS_ENUM (PresentationInfo, AudioBus);
+	REGISTER_CLASS_ENUM (PresentationInfo, MidiBus);
+	REGISTER_CLASS_ENUM (PresentationInfo, VCA);
+	REGISTER_CLASS_ENUM (PresentationInfo, MasterOut);
+	REGISTER_CLASS_ENUM (PresentationInfo, MonitorOut);
+	REGISTER_CLASS_ENUM (PresentationInfo, Auditioner);
+	REGISTER_CLASS_ENUM (PresentationInfo, Selected);
+	REGISTER_CLASS_ENUM (PresentationInfo, Hidden);
+	REGISTER_CLASS_ENUM (PresentationInfo, OrderSet);
+	REGISTER_BITS (_PresentationInfo_Flag);
+
+	REGISTER_CLASS_ENUM (MusicalMode,Dorian);
+	REGISTER_CLASS_ENUM (MusicalMode, IonianMajor);
+	REGISTER_CLASS_ENUM (MusicalMode, AeolianMinor);
+	REGISTER_CLASS_ENUM (MusicalMode, HarmonicMinor);
+	REGISTER_CLASS_ENUM (MusicalMode, MelodicMinorAscending);
+	REGISTER_CLASS_ENUM (MusicalMode, MelodicMinorDescending);
+	REGISTER_CLASS_ENUM (MusicalMode, Phrygian);
+	REGISTER_CLASS_ENUM (MusicalMode, Lydian);
+	REGISTER_CLASS_ENUM (MusicalMode, Mixolydian);
+	REGISTER_CLASS_ENUM (MusicalMode, Locrian);
+	REGISTER_CLASS_ENUM (MusicalMode, PentatonicMajor);
+	REGISTER_CLASS_ENUM (MusicalMode, PentatonicMinor);
+	REGISTER_CLASS_ENUM (MusicalMode, Chromatic);
+	REGISTER_CLASS_ENUM (MusicalMode, BluesScale);
+	REGISTER_CLASS_ENUM (MusicalMode, NeapolitanMinor);
+	REGISTER_CLASS_ENUM (MusicalMode, NeapolitanMajor);
+	REGISTER_CLASS_ENUM (MusicalMode, Oriental);
+	REGISTER_CLASS_ENUM (MusicalMode, DoubleHarmonic);
+	REGISTER_CLASS_ENUM (MusicalMode, Enigmatic);
+	REGISTER_CLASS_ENUM (MusicalMode, Hirajoshi);
+	REGISTER_CLASS_ENUM (MusicalMode, HungarianMinor);
+	REGISTER_CLASS_ENUM (MusicalMode, HungarianMajor);
+	REGISTER_CLASS_ENUM (MusicalMode, Kumoi);
+	REGISTER_CLASS_ENUM (MusicalMode, Iwato);
+	REGISTER_CLASS_ENUM (MusicalMode, Hindu);
+	REGISTER_CLASS_ENUM (MusicalMode, Spanish8Tone);
+	REGISTER_CLASS_ENUM (MusicalMode, Pelog);
+	REGISTER_CLASS_ENUM (MusicalMode, HungarianGypsy);
+	REGISTER_CLASS_ENUM (MusicalMode, Overtone);
+	REGISTER_CLASS_ENUM (MusicalMode, LeadingWholeTone);
+	REGISTER_CLASS_ENUM (MusicalMode, Arabian);
+	REGISTER_CLASS_ENUM (MusicalMode, Balinese);
+	REGISTER_CLASS_ENUM (MusicalMode, Gypsy);
+	REGISTER_CLASS_ENUM (MusicalMode, Mohammedan);
+	REGISTER_CLASS_ENUM (MusicalMode, Javanese);
+	REGISTER_CLASS_ENUM (MusicalMode, Persian);
+	REGISTER_CLASS_ENUM (MusicalMode, Algerian);
+	REGISTER (mode);
 }
 
 } /* namespace ARDOUR */
@@ -771,6 +833,20 @@ std::ostream& operator<<(std::ostream& o, const TracksAutoNamingRule& var)
 	return o << s;
 }
 
+std::istream& operator>>(std::istream& o, MonitorChoice& var)
+{
+	std::string s;
+	o >> s;
+	var = (MonitorChoice) string_2_enum (s, var);
+	return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const MonitorChoice& var)
+{
+	std::string s = enum_2_string (var);
+	return o << s;
+}
+
 std::istream& operator>>(std::istream& o, MonitorModel& var)
 {
 	std::string s;
@@ -813,47 +889,48 @@ std::ostream& operator<<(std::ostream& o, const MeterLineUp& var)
 	return o << s;
 }
 
-std::istream& operator>>(std::istream& o, PFLPosition& var)
+std::istream& operator>>(std::istream& o, LocaleMode& var)
 {
 	std::string s;
 	o >> s;
-	var = (PFLPosition) string_2_enum (s, var);
+	var = (LocaleMode) string_2_enum (s, var);
 	return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const PFLPosition& var)
+std::ostream& operator<<(std::ostream& o, const LocaleMode& var)
 {
 	std::string s = enum_2_string (var);
 	return o << s;
 }
 
-std::istream& operator>>(std::istream& o, AFLPosition& var)
+std::istream& operator>>(std::istream& o, PFLPosition& var)
 {
 	std::string s;
 	o >> s;
-	var = (AFLPosition) string_2_enum (s, var);
+	var = (PFLPosition) string_2_enum (s, var);
 	return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const AFLPosition& var)
+std::ostream& operator<<(std::ostream& o, const PFLPosition& var)
 {
 	std::string s = enum_2_string (var);
 	return o << s;
 }
 
-std::istream& operator>>(std::istream& o, RemoteModel& var)
+std::istream& operator>>(std::istream& o, AFLPosition& var)
 {
 	std::string s;
 	o >> s;
-	var = (RemoteModel) string_2_enum (s, var);
+	var = (AFLPosition) string_2_enum (s, var);
 	return o;
 }
 
-std::ostream& operator<<(std::ostream& o, const RemoteModel& var)
+std::ostream& operator<<(std::ostream& o, const AFLPosition& var)
 {
 	std::string s = enum_2_string (var);
 	return o << s;
 }
+
 std::istream& operator>>(std::istream& o, EditMode& var)
 {
 	std::string s;