fix up enum mess caused by switching from JACK to Engine as the name for jack-related...

[ardour.git] / libs / ardour / enums.cc

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 0509d4a2c83978be01ccec3dca2deda0eba0f835..2a38cd2c8a88bf3ce507df209de936a483e0ed08 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -55,12 +55,14 @@ 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;
@@ -172,6 +174,19 @@ 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 (MeterIEC1DIN);
+       REGISTER_ENUM (MeterIEC1NOR);
+       REGISTER_ENUM (MeterIEC2BBC);
+       REGISTER_ENUM (MeterIEC2EBU);
+       REGISTER_ENUM (MeterVU);
+       REGISTER (_MeterType);
+
        REGISTER_ENUM (Normal);
        REGISTER_ENUM (NonLayered);
        REGISTER_ENUM (Destructive);
@@ -208,6 +223,12 @@ 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);
@@ -315,6 +336,7 @@ setup_enum_writer ()
 
        REGISTER_ENUM (MTC);
        REGISTER_ENUM (JACK);
+       REGISTER_ENUM (Engine);
        REGISTER_ENUM (MIDIClock);
        REGISTER_ENUM (LTC);
        REGISTER (_SyncSource);
@@ -488,6 +510,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);
@@ -661,6 +684,20 @@ std::ostream& operator<<(std::ostream& o, const MonitorModel& var)
        return o << s;
 }
 
+std::istream& operator>>(std::istream& o, VUMeterStandard& var)
+{
+       std::string s;
+       o >> s;
+       var = (VUMeterStandard) string_2_enum (s, var);
+       return o;
+}
+
+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, MeterLineUp& var)
 {
        std::string s;