X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fenums.cc;h=a674a219fd0c4292c6897c372bb547aeed935f7e;hb=b68a4e5cdc59ffb81c1952ac9cad63ddf0c76d06;hp=b291372503890b41ee406ceff02bfa06f28d6548;hpb=9a4fbfcdfe0db5eade0a2bd77fe62c5ffa73103d;p=ardour.git diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index b291372503..a674a219fd 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -41,6 +41,7 @@ using namespace std; using namespace PBD; using namespace ARDOUR; using namespace MIDI; +using namespace Timecode; namespace ARDOUR { @@ -54,12 +55,15 @@ setup_enum_writer () AlignStyle _AlignStyle; AlignChoice _AlignChoice; MeterPoint _MeterPoint; + MeterType _MeterType; TrackMode _TrackMode; NoteMode _NoteMode; ChannelMode _ChannelMode; ColorMode _ColorMode; MeterFalloff _MeterFalloff; MeterHold _MeterHold; + VUMeterStandard _VUMeterStandard; + MeterLineUp _MeterLineUp; EditMode _EditMode; RegionPoint _RegionPoint; Placement _Placement; @@ -70,8 +74,6 @@ setup_enum_writer () AFLPosition _AFLPosition; RemoteModel _RemoteModel; DenormalModel _DenormalModel; - CrossfadeModel _CrossfadeModel; - CrossfadeChoice _CrossfadeChoice; InsertMergePolicy _InsertMergePolicy; ListenPosition _ListenPosition; SampleFormat _SampleFormat; @@ -83,15 +85,16 @@ setup_enum_writer () ShuttleUnits _ShuttleUnits; Session::RecordState _Session_RecordState; SessionEvent::Type _SessionEvent_Type; + SessionEvent::Action _SessionEvent_Action; TimecodeFormat _Session_TimecodeFormat; Session::PullupFormat _Session_PullupFormat; FadeShape _FadeShape; + RegionSelectionAfterSplit _RegionSelectionAfterSplit; IOChange _IOChange; AutomationType _AutomationType; AutoState _AutoState; AutoStyle _AutoStyle; AutoConnectOption _AutoConnectOption; - RouteSortOrderKey _RouteSortOrderKey; Session::StateOfTheState _Session_StateOfTheState; Route::Flag _Route_Flag; Source::Flag _Source_Flag; @@ -136,6 +139,7 @@ setup_enum_writer () REGISTER_ENUM (PanElevationAutomation); REGISTER_ENUM (PanWidthAutomation); REGISTER_ENUM (PluginAutomation); + REGISTER_ENUM (PluginPropertyAutomation); REGISTER_ENUM (SoloAutomation); REGISTER_ENUM (MuteAutomation); REGISTER_ENUM (MidiCCAutomation); @@ -170,6 +174,20 @@ setup_enum_writer () REGISTER_ENUM (MeterCustom); REGISTER (_MeterPoint); + REGISTER_ENUM (MeterMaxSignal); + REGISTER_ENUM (MeterMaxPeak); + REGISTER_ENUM (MeterPeak); + REGISTER_ENUM (MeterKrms); + REGISTER_ENUM (MeterK20); + REGISTER_ENUM (MeterK14); + REGISTER_ENUM (MeterK12); + REGISTER_ENUM (MeterIEC1DIN); + REGISTER_ENUM (MeterIEC1NOR); + REGISTER_ENUM (MeterIEC2BBC); + REGISTER_ENUM (MeterIEC2EBU); + REGISTER_ENUM (MeterVU); + REGISTER (_MeterType); + REGISTER_ENUM (Normal); REGISTER_ENUM (NonLayered); REGISTER_ENUM (Destructive); @@ -192,6 +210,8 @@ setup_enum_writer () REGISTER_ENUM (MeterFalloffOff); REGISTER_ENUM (MeterFalloffSlowest); REGISTER_ENUM (MeterFalloffSlow); + REGISTER_ENUM (MeterFalloffSlowish); + REGISTER_ENUM (MeterFalloffModerate); REGISTER_ENUM (MeterFalloffMedium); REGISTER_ENUM (MeterFalloffFast); REGISTER_ENUM (MeterFalloffFaster); @@ -204,10 +224,28 @@ setup_enum_writer () REGISTER_ENUM (MeterHoldLong); REGISTER (_MeterHold); + REGISTER_ENUM (MeteringVUfrench); + REGISTER_ENUM (MeteringVUamerican); + REGISTER_ENUM (MeteringVUstandard); + REGISTER_ENUM (MeteringVUeight); + REGISTER (_VUMeterStandard); + + REGISTER_ENUM (MeteringLineUp24); + REGISTER_ENUM (MeteringLineUp20); + REGISTER_ENUM (MeteringLineUp18); + REGISTER_ENUM (MeteringLineUp15); + REGISTER (_MeterLineUp); + REGISTER_ENUM (Slide); REGISTER_ENUM (Splice); + REGISTER_ENUM (Ripple); // XXX do the old enum values have to stay in order? REGISTER_ENUM (Lock); REGISTER (_EditMode); + /* + * Splice mode is undefined, undocumented, and basically fubar'ed + * perhaps someday we will make it work. but for now, avoid it + */ + enum_writer.add_to_hack_table ("Splice", "Slide"); REGISTER_ENUM (Start); REGISTER_ENUM (End); @@ -250,17 +288,13 @@ setup_enum_writer () REGISTER_ENUM (UserOrdered); REGISTER_ENUM (MixerOrdered); - REGISTER_ENUM (EditorOrdered); REGISTER (_RemoteModel); - - REGISTER_ENUM (FullCrossfade); - REGISTER_ENUM (ShortCrossfade); - REGISTER (_CrossfadeModel); - - REGISTER_ENUM (RegionFades); - REGISTER_ENUM (ConstantPowerMinus3dB); - REGISTER_ENUM (ConstantPowerMinus6dB); - REGISTER (_CrossfadeChoice); + /* + * EditorOrdered has been deprecated + * since the removal of independent + * editor / mixer ordering. + */ + enum_writer.add_to_hack_table ("EditorOrdered", "MixerOrdered"); REGISTER_ENUM (InsertMergeReject); REGISTER_ENUM (InsertMergeRelax); @@ -305,7 +339,9 @@ setup_enum_writer () REGISTER_ENUM (MTC); REGISTER_ENUM (JACK); + REGISTER_ENUM (Engine); REGISTER_ENUM (MIDIClock); + REGISTER_ENUM (LTC); REGISTER (_SyncSource); REGISTER_ENUM (Sprung); @@ -336,10 +372,23 @@ setup_enum_writer () REGISTER_CLASS_ENUM (SessionEvent, Audition); REGISTER_CLASS_ENUM (SessionEvent, InputConfigurationChange); REGISTER_CLASS_ENUM (SessionEvent, SetPlayAudioRange); + REGISTER_CLASS_ENUM (SessionEvent, CancelPlayAudioRange); + REGISTER_CLASS_ENUM (SessionEvent, RealTimeOperation); + REGISTER_CLASS_ENUM (SessionEvent, AdjustPlaybackBuffering); + REGISTER_CLASS_ENUM (SessionEvent, AdjustCaptureBuffering); + REGISTER_CLASS_ENUM (SessionEvent, SetTimecodeTransmission); + REGISTER_CLASS_ENUM (SessionEvent, Skip); REGISTER_CLASS_ENUM (SessionEvent, StopOnce); REGISTER_CLASS_ENUM (SessionEvent, AutoLoop); + REGISTER_CLASS_ENUM (SessionEvent, AutoLoopDeclick); REGISTER (_SessionEvent_Type); + REGISTER_CLASS_ENUM (SessionEvent, Add); + REGISTER_CLASS_ENUM (SessionEvent, Remove); + REGISTER_CLASS_ENUM (SessionEvent, Replace); + REGISTER_CLASS_ENUM (SessionEvent, Clear); + REGISTER (_SessionEvent_Action); + REGISTER_CLASS_ENUM (Session, Stopped); REGISTER_CLASS_ENUM (Session, Waiting); REGISTER_CLASS_ENUM (Session, Running); @@ -396,15 +445,11 @@ setup_enum_writer () REGISTER_CLASS_ENUM (Session, pullup_Minus4Minus1); REGISTER (_Session_PullupFormat); - REGISTER_CLASS_ENUM (Route, Hidden); + REGISTER_CLASS_ENUM (Route, Auditioner); REGISTER_CLASS_ENUM (Route, MasterOut); REGISTER_CLASS_ENUM (Route, MonitorOut); REGISTER_BITS (_Route_Flag); - REGISTER_ENUM (MixerSort); - REGISTER_ENUM (EditorSort); - REGISTER (_RouteSortOrderKey); - REGISTER_CLASS_ENUM (Source, Writable); REGISTER_CLASS_ENUM (Source, CanRename); REGISTER_CLASS_ENUM (Source, Broadcast); @@ -413,6 +458,7 @@ setup_enum_writer () REGISTER_CLASS_ENUM (Source, RemoveAtDestroy); REGISTER_CLASS_ENUM (Source, NoPeakFile); REGISTER_CLASS_ENUM (Source, Destructive); + REGISTER_CLASS_ENUM (Source, Empty); REGISTER_BITS (_Source_Flag); REGISTER_ENUM (FadeLinear); @@ -422,6 +468,16 @@ setup_enum_writer () REGISTER_ENUM (FadeSymmetric); REGISTER (_FadeShape); + REGISTER_ENUM(None); + REGISTER_ENUM(NewlyCreatedLeft); + REGISTER_ENUM(NewlyCreatedRight); + REGISTER_ENUM(NewlyCreatedBoth); + REGISTER_ENUM(Existing); + REGISTER_ENUM(ExistingNewlyCreatedLeft); + REGISTER_ENUM(ExistingNewlyCreatedRight); + REGISTER_ENUM(ExistingNewlyCreatedBoth); + REGISTER (_RegionSelectionAfterSplit); + REGISTER_CLASS_ENUM (Diskstream, Recordable); REGISTER_CLASS_ENUM (Diskstream, Hidden); REGISTER_CLASS_ENUM (Diskstream, Destructive); @@ -434,6 +490,7 @@ setup_enum_writer () REGISTER_CLASS_ENUM (Location, IsCDMarker); REGISTER_CLASS_ENUM (Location, IsSessionRange); REGISTER_CLASS_ENUM (Location, IsRangeMarker); + REGISTER_CLASS_ENUM (Location, IsSkip); REGISTER_BITS (_Location_Flags); REGISTER_CLASS_ENUM (Track, NoFreeze); @@ -477,6 +534,7 @@ setup_enum_writer () REGISTER_CLASS_ENUM (ExportFormatBase, F_RAW); REGISTER_CLASS_ENUM (ExportFormatBase, F_FLAC); REGISTER_CLASS_ENUM (ExportFormatBase, F_Ogg); + REGISTER_CLASS_ENUM (ExportFormatBase, F_CAF); REGISTER (_ExportFormatBase_FormatId); REGISTER_CLASS_ENUM (ExportFormatBase, E_FileDefault); @@ -650,110 +708,110 @@ std::ostream& operator<<(std::ostream& o, const MonitorModel& var) return o << s; } -std::istream& operator>>(std::istream& o, PFLPosition& var) +std::istream& operator>>(std::istream& o, VUMeterStandard& var) { std::string s; o >> s; - var = (PFLPosition) string_2_enum (s, var); + var = (VUMeterStandard) string_2_enum (s, var); return o; } -std::ostream& operator<<(std::ostream& o, const PFLPosition& var) +std::ostream& operator<<(std::ostream& o, const VUMeterStandard& 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, MeterLineUp& var) { std::string s; o >> s; - var = (AFLPosition) string_2_enum (s, var); + var = (MeterLineUp) string_2_enum (s, var); return o; } -std::ostream& operator<<(std::ostream& o, const AFLPosition& var) +std::ostream& operator<<(std::ostream& o, const MeterLineUp& 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, PFLPosition& var) { std::string s; o >> s; - var = (RemoteModel) string_2_enum (s, var); + var = (PFLPosition) string_2_enum (s, var); return o; } -std::ostream& operator<<(std::ostream& o, const RemoteModel& 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, EditMode& var) + +std::istream& operator>>(std::istream& o, AFLPosition& var) { std::string s; o >> s; - var = (EditMode) string_2_enum (s, var); + var = (AFLPosition) string_2_enum (s, var); return o; } -std::ostream& operator<<(std::ostream& o, const EditMode& 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, ListenPosition& var) + +std::istream& operator>>(std::istream& o, RemoteModel& var) { std::string s; o >> s; - var = (ListenPosition) string_2_enum (s, var); + var = (RemoteModel) string_2_enum (s, var); return o; } -std::ostream& operator<<(std::ostream& o, const ListenPosition& var) +std::ostream& operator<<(std::ostream& o, const RemoteModel& var) { std::string s = enum_2_string (var); return o << s; } - -std::istream& operator>>(std::istream& o, InsertMergePolicy& var) +std::istream& operator>>(std::istream& o, EditMode& var) { std::string s; o >> s; - var = (InsertMergePolicy) string_2_enum (s, var); + var = (EditMode) string_2_enum (s, var); return o; } -std::ostream& operator<<(std::ostream& o, const InsertMergePolicy& var) + +std::ostream& operator<<(std::ostream& o, const EditMode& var) { std::string s = enum_2_string (var); return o << s; } - -std::istream& operator>>(std::istream& o, CrossfadeModel& var) +std::istream& operator>>(std::istream& o, ListenPosition& var) { std::string s; o >> s; - var = (CrossfadeModel) string_2_enum (s, var); + var = (ListenPosition) string_2_enum (s, var); return o; } -std::ostream& operator<<(std::ostream& o, const CrossfadeModel& var) +std::ostream& operator<<(std::ostream& o, const ListenPosition& var) { std::string s = enum_2_string (var); return o << s; } -std::istream& operator>>(std::istream& o, CrossfadeChoice& var) +std::istream& operator>>(std::istream& o, InsertMergePolicy& var) { std::string s; o >> s; - var = (CrossfadeChoice) string_2_enum (s, var); + var = (InsertMergePolicy) string_2_enum (s, var); return o; } - -std::ostream& operator<<(std::ostream& o, const CrossfadeChoice& var) +std::ostream& operator<<(std::ostream& o, const InsertMergePolicy& var) { std::string s = enum_2_string (var); return o << s; @@ -878,3 +936,31 @@ std::ostream& operator<<(std::ostream& o, const Evoral::OverlapType& var) std::string s = enum_2_string (var); return o << s; } + +std::istream& operator>>(std::istream& o, FadeShape& var) +{ + std::string s; + o >> s; + var = (FadeShape) string_2_enum (s, var); + return o; +} + +std::ostream& operator<<(std::ostream& o, const FadeShape& var) +{ + std::string s = enum_2_string (var); + return o << s; +} + +std::istream& operator>>(std::istream& o, RegionSelectionAfterSplit& var) +{ + std::string s; + o >> s; + var = (RegionSelectionAfterSplit) string_2_enum (s, var); + return o; +} + +std::ostream& operator<<(std::ostream& o, const RegionSelectionAfterSplit& var) +{ + std::string s = enum_2_string (var); + return o << s; +}