fix up wscript/build issues in exportvis after merge with master

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index b96394d16fe36d459feff6c698dfee4b0924e96c..72125f87723a24556d13e995d37ec0bc6eb7a28f 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -55,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;
@@ -92,7 +95,6 @@ setup_enum_writer ()
        AutoState _AutoState;
        AutoStyle _AutoStyle;
        AutoConnectOption _AutoConnectOption;
-       RouteSortOrderKey _RouteSortOrderKey;
        Session::StateOfTheState _Session_StateOfTheState;
        Route::Flag _Route_Flag;
        Source::Flag _Source_Flag;
@@ -171,6 +173,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);
@@ -193,6 +208,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);
@@ -205,6 +222,18 @@ 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 (Lock);
@@ -251,8 +280,13 @@ setup_enum_writer ()
 
        REGISTER_ENUM (UserOrdered);
        REGISTER_ENUM (MixerOrdered);
-       REGISTER_ENUM (EditorOrdered);
        REGISTER (_RemoteModel);
+       /*
+        * EditorOrdered has been deprecated
+        * since the removal of independent 
+        * editor / mixer ordering.
+       */
+       enum_writer.add_to_hack_table ("EditorOrdered", "MixerOrdered");
 
        REGISTER_ENUM (FullCrossfade);
        REGISTER_ENUM (ShortCrossfade);
@@ -306,6 +340,7 @@ setup_enum_writer ()
 
        REGISTER_ENUM (MTC);
        REGISTER_ENUM (JACK);
+       REGISTER_ENUM (Engine);
        REGISTER_ENUM (MIDIClock);
        REGISTER_ENUM (LTC);
        REGISTER (_SyncSource);
@@ -403,10 +438,6 @@ setup_enum_writer ()
        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);
@@ -479,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);
@@ -652,6 +684,34 @@ 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;
+       o >> s;
+       var = (MeterLineUp) string_2_enum (s, var);
+       return o;
+}
+
+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, PFLPosition& var)
 {
        std::string s;