LuaProc::can_support_io_configuration: don't mix int and int32_t

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 85634640b95ddb7a0311557a021747dd35638328..6e90bd01f0cb016b31dbd3df08a0e7c58b7fec80 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -32,6 +32,7 @@
 #include "ardour/location.h"
 #include "ardour/midi_model.h"
 #include "ardour/mute_master.h"
+#include "ardour/presentation_info.h"
 #include "ardour/session.h"
 #include "ardour/source.h"
 #include "ardour/tempo.h"
@@ -73,7 +74,6 @@ setup_enum_writer ()
        MonitorState _MonitorState;
        PFLPosition _PFLPosition;
        AFLPosition _AFLPosition;
-       RemoteModel _RemoteModel;
        DenormalModel _DenormalModel;
        LayerModel _LayerModel;
        InsertMergePolicy _InsertMergePolicy;
@@ -99,7 +99,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 +133,7 @@ setup_enum_writer ()
        Evoral::OverlapType _OverlapType;
         BufferingPreset _BufferingPreset;
        AutoReturnTarget _AutoReturnTarget;
+       PresentationInfo::Flag _PresentationInfo_Flag;
 
 #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()
@@ -322,9 +322,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
@@ -491,11 +488,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);
@@ -709,6 +701,19 @@ 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);
 }
 
 } /* namespace ARDOUR */
@@ -841,19 +846,6 @@ std::ostream& operator<<(std::ostream& o, const AFLPosition& var)
        return o << s;
 }
 
-std::istream& operator>>(std::istream& o, RemoteModel& var)
-{
-       std::string s;
-       o >> s;
-       var = (RemoteModel) string_2_enum (s, var);
-       return o;
-}
-
-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, EditMode& var)
 {
        std::string s;