fix AU preset list

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 24b060ec28f0f11b0b18fd8c15635ee9f5cdeeaf..8fdb8462de74faff8950f74148cb614ff4213da0 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -151,7 +151,7 @@ setup_enum_writer ()
        REGISTER_ENUM (FadeInAutomation);
        REGISTER_ENUM (FadeOutAutomation);
        REGISTER_ENUM (EnvelopeAutomation);
-       REGISTER_BITS (_AutomationType);
+       REGISTER (_AutomationType);
 
        REGISTER_ENUM (Off);
        REGISTER_ENUM (Write);
@@ -192,6 +192,7 @@ setup_enum_writer ()
        REGISTER_ENUM (MeterIEC2EBU);
        REGISTER_ENUM (MeterVU);
        REGISTER_ENUM (MeterPeak0dB);
+       REGISTER_ENUM (MeterMCP);
        REGISTER (_MeterType);
 
        REGISTER_ENUM (Normal);
@@ -297,7 +298,7 @@ setup_enum_writer ()
        REGISTER (_RemoteModel);
        /*
         * EditorOrdered has been deprecated
-        * since the removal of independent 
+        * since the removal of independent
         * editor / mixer ordering.
        */
        enum_writer.add_to_hack_table ("EditorOrdered", "MixerOrdered");
@@ -325,7 +326,7 @@ setup_enum_writer ()
        REGISTER_ENUM (UseDefaultNames);
        REGISTER_ENUM (NameAfterDriver);
        REGISTER_BITS (_TracksAutoNamingRule);
-    
+
        REGISTER_ENUM (FormatFloat);
        REGISTER_ENUM (FormatInt24);
        REGISTER_ENUM (FormatInt16);
@@ -343,6 +344,8 @@ setup_enum_writer ()
        REGISTER_ENUM (AIFF);
        REGISTER_ENUM (iXML);
        REGISTER_ENUM (RF64);
+       REGISTER_ENUM (RF64_WAV);
+       REGISTER_ENUM (MBWF);
        REGISTER (_HeaderFormat);
 
        REGISTER_ENUM (AudioUnit);
@@ -402,7 +405,7 @@ setup_enum_writer ()
        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);
@@ -1047,4 +1050,16 @@ std::ostream& operator<<(std::ostream& o, const AutoReturnTarget& var)
        return o << s;
 }
 
-       
+std::istream& operator>>(std::istream& o, MeterType& var)
+{
+       std::string s;
+       o >> s;
+       var = (MeterType) string_2_enum (s, var);
+       return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const MeterType& var)
+{
+       std::string s = enum_2_string (var);
+       return o << s;
+}