projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
debug output
[ardour.git] / libs / ardour / enums.cc
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 870c60eec72ceb25c2aa4ee265ffcd5fce54b719..2d29a59e8bd418c6de71a7e918c89c95995908b3 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -18,6 +18,7 @@
 */
 
 #include "pbd/enumwriter.h"
+#include "midi++/types.h"
 
 #include "ardour/audiofilesource.h"
 #include "ardour/audioregion.h"
@@ -40,11 +41,14 @@
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace MIDI;
+
+namespace ARDOUR {
 
 void
 setup_enum_writer ()
 {
-       EnumWriter* enum_writer = new EnumWriter();
+       EnumWriter& enum_writer (EnumWriter::instance());
        vector<int> i;
        vector<string> s;
 
@@ -65,6 +69,7 @@ setup_enum_writer ()
        DenormalModel _DenormalModel;
        CrossfadeModel _CrossfadeModel;
        LayerModel _LayerModel;
+       InsertMergePolicy _InsertMergePolicy;
        ListenPosition _ListenPosition;
        SampleFormat _SampleFormat;
        CDMarkerFormat _CDMarkerFormat;
@@ -74,7 +79,7 @@ setup_enum_writer ()
        ShuttleBehaviour _ShuttleBehaviour;
        ShuttleUnits _ShuttleUnits;
        Session::RecordState _Session_RecordState;
-       Session::Event::Type _Session_Event_Type;
+       SessionEvent::Type _SessionEvent_Type;
        TimecodeFormat _Session_TimecodeFormat;
        Session::PullupFormat _Session_PullupFormat;
        AudioRegion::FadeShape _AudioRegion_FadeShape;
@@ -89,10 +94,7 @@ setup_enum_writer ()
        Source::Flag _Source_Flag;
        Diskstream::Flag _Diskstream_Flag;
        Location::Flags _Location_Flags;
-       RouteGroup::Flag _RouteGroup_Flag;
-       RouteGroup::Property _RouteGroup_Property;
-       Region::Flag _Region_Flag;
-       Region::PositionLockStyle _Region_PositionLockStyle;
+       PositionLockStyle _PositionLockStyle;
        Track::FreezeState _Track_FreezeState;
        AutomationList::InterpolationStyle _AutomationList_InterpolationStyle;
        AnyTime::Type _AnyTime_Type;
@@ -115,9 +117,11 @@ setup_enum_writer ()
        WaveformShape _WaveformShape;
        QuantizeType _QuantizeType;
        Session::PostTransportWork _Session_PostTransportWork;
-               
-#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()
+       Session::SlaveState _Session_SlaveState;
+       MTC_Status _MIDI_MTC_Status;
+
+#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()
 #define REGISTER_ENUM(e) i.push_back (e); s.push_back (#e)
 #define REGISTER_CLASS_ENUM(t,e) i.push_back (t::e); s.push_back (#e)
 
@@ -235,6 +239,14 @@ setup_enum_writer ()
        REGISTER_ENUM (MoveAddHigher);
        REGISTER_ENUM (AddHigher);
        REGISTER (_LayerModel);
+        
+        REGISTER_ENUM (InsertMergeReject);
+        REGISTER_ENUM (InsertMergeRelax);
+        REGISTER_ENUM (InsertMergeReplace);
+        REGISTER_ENUM (InsertMergeTruncateExisting);
+        REGISTER_ENUM (InsertMergeTruncateAddition);
+        REGISTER_ENUM (InsertMergeExtend);
+        REGISTER (_InsertMergePolicy);
 
        REGISTER_ENUM (AfterFaderListen);
        REGISTER_ENUM (PreFaderListen);
@@ -286,24 +298,34 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Session, Recording);
        REGISTER (_Session_RecordState);
 
-       REGISTER_CLASS_ENUM (Session::Event, SetTransportSpeed);
-       REGISTER_CLASS_ENUM (Session::Event, SetDiskstreamSpeed);
-       REGISTER_CLASS_ENUM (Session::Event, Locate);
-       REGISTER_CLASS_ENUM (Session::Event, LocateRoll);
-       REGISTER_CLASS_ENUM (Session::Event, LocateRollLocate);
-       REGISTER_CLASS_ENUM (Session::Event, SetLoop);
-       REGISTER_CLASS_ENUM (Session::Event, PunchIn);
-       REGISTER_CLASS_ENUM (Session::Event, PunchOut);
-       REGISTER_CLASS_ENUM (Session::Event, RangeStop);
-       REGISTER_CLASS_ENUM (Session::Event, RangeLocate);
-       REGISTER_CLASS_ENUM (Session::Event, Overwrite);
-       REGISTER_CLASS_ENUM (Session::Event, SetSyncSource);
-       REGISTER_CLASS_ENUM (Session::Event, Audition);
-       REGISTER_CLASS_ENUM (Session::Event, InputConfigurationChange);
-       REGISTER_CLASS_ENUM (Session::Event, SetPlayAudioRange);
-       REGISTER_CLASS_ENUM (Session::Event, StopOnce);
-       REGISTER_CLASS_ENUM (Session::Event, AutoLoop);
-       REGISTER (_Session_Event_Type);
+       REGISTER_CLASS_ENUM (SessionEvent, SetTransportSpeed);
+       REGISTER_CLASS_ENUM (SessionEvent, SetTrackSpeed);
+       REGISTER_CLASS_ENUM (SessionEvent, Locate);
+       REGISTER_CLASS_ENUM (SessionEvent, LocateRoll);
+       REGISTER_CLASS_ENUM (SessionEvent, LocateRollLocate);
+       REGISTER_CLASS_ENUM (SessionEvent, SetLoop);
+       REGISTER_CLASS_ENUM (SessionEvent, PunchIn);
+       REGISTER_CLASS_ENUM (SessionEvent, PunchOut);
+       REGISTER_CLASS_ENUM (SessionEvent, RangeStop);
+       REGISTER_CLASS_ENUM (SessionEvent, RangeLocate);
+       REGISTER_CLASS_ENUM (SessionEvent, Overwrite);
+       REGISTER_CLASS_ENUM (SessionEvent, SetSyncSource);
+       REGISTER_CLASS_ENUM (SessionEvent, Audition);
+       REGISTER_CLASS_ENUM (SessionEvent, InputConfigurationChange);
+       REGISTER_CLASS_ENUM (SessionEvent, SetPlayAudioRange);
+       REGISTER_CLASS_ENUM (SessionEvent, StopOnce);
+       REGISTER_CLASS_ENUM (SessionEvent, AutoLoop);
+       REGISTER (_SessionEvent_Type);
+
+       REGISTER_CLASS_ENUM (Session, Stopped);
+       REGISTER_CLASS_ENUM (Session, Waiting);
+       REGISTER_CLASS_ENUM (Session, Running);
+       REGISTER (_Session_SlaveState);
+
+       REGISTER_ENUM (MTC_Stopped);
+       REGISTER_ENUM (MTC_Forward);
+       REGISTER_ENUM (MTC_Backward);
+       REGISTER (_MIDI_MTC_Status);
 
        REGISTER_CLASS_ENUM (Session, PostTransportStop);
        REGISTER_CLASS_ENUM (Session, PostTransportDisableRecord);
@@ -357,7 +379,7 @@ setup_enum_writer ()
 
        REGISTER_CLASS_ENUM (Route, Hidden);
        REGISTER_CLASS_ENUM (Route, MasterOut);
-       REGISTER_CLASS_ENUM (Route, ControlOut);
+       REGISTER_CLASS_ENUM (Route, MonitorOut);
        REGISTER_BITS (_Route_Flag);
 
        REGISTER_CLASS_ENUM (Source, Writable);
@@ -387,53 +409,14 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Location, IsAutoLoop);
        REGISTER_CLASS_ENUM (Location, IsHidden);
        REGISTER_CLASS_ENUM (Location, IsCDMarker);
-       REGISTER_CLASS_ENUM (Location, IsEnd);
+       REGISTER_CLASS_ENUM (Location, IsSessionRange);
        REGISTER_CLASS_ENUM (Location, IsRangeMarker);
-       REGISTER_CLASS_ENUM (Location, IsStart);
        REGISTER_BITS (_Location_Flags);
 
-       REGISTER_CLASS_ENUM (RouteGroup, Relative);
-       REGISTER_CLASS_ENUM (RouteGroup, Active);
-       REGISTER_CLASS_ENUM (RouteGroup, Hidden);
-       REGISTER_BITS (_RouteGroup_Flag);
-
-       REGISTER_CLASS_ENUM (RouteGroup, Gain);
-       REGISTER_CLASS_ENUM (RouteGroup, Mute);
-       REGISTER_CLASS_ENUM (RouteGroup, Solo);
-       REGISTER_CLASS_ENUM (RouteGroup, RecEnable);
-       REGISTER_CLASS_ENUM (RouteGroup, Select);
-       REGISTER_CLASS_ENUM (RouteGroup, Edit);
-       REGISTER_BITS (_RouteGroup_Property);
-
        REGISTER_CLASS_ENUM (Panner, SameDirection);
        REGISTER_CLASS_ENUM (Panner, OppositeDirection);
        REGISTER (_Panner_LinkDirection);
 
-       REGISTER_CLASS_ENUM (Region, Muted);
-       REGISTER_CLASS_ENUM (Region, Opaque);
-       REGISTER_CLASS_ENUM (Region, EnvelopeActive);
-       REGISTER_CLASS_ENUM (Region, DefaultFadeIn);
-       REGISTER_CLASS_ENUM (Region, DefaultFadeOut);
-       REGISTER_CLASS_ENUM (Region, Locked);
-       REGISTER_CLASS_ENUM (Region, PositionLocked);
-       REGISTER_CLASS_ENUM (Region, Automatic);
-       REGISTER_CLASS_ENUM (Region, WholeFile);
-       REGISTER_CLASS_ENUM (Region, FadeIn);
-       REGISTER_CLASS_ENUM (Region, FadeOut);
-       REGISTER_CLASS_ENUM (Region, Copied);
-       REGISTER_CLASS_ENUM (Region, Import);
-       REGISTER_CLASS_ENUM (Region, External);
-       REGISTER_CLASS_ENUM (Region, SyncMarked);
-       REGISTER_CLASS_ENUM (Region, LeftOfSplit);
-       REGISTER_CLASS_ENUM (Region, RightOfSplit);
-       REGISTER_CLASS_ENUM (Region, Hidden);
-       REGISTER_CLASS_ENUM (Region, DoNotSendPropertyChanges);
-       REGISTER_BITS (_Region_Flag);
-
-       REGISTER_CLASS_ENUM (Region, AudioTime);
-       REGISTER_CLASS_ENUM (Region, MusicTime);
-       REGISTER_BITS (_Region_PositionLockStyle);
-
        REGISTER_CLASS_ENUM (Track, NoFreeze);
        REGISTER_CLASS_ENUM (Track, Frozen);
        REGISTER_CLASS_ENUM (Track, UnFrozen);
@@ -567,8 +550,13 @@ setup_enum_writer ()
        REGISTER_ENUM(Groove);
        REGISTER(_QuantizeType);
 
+       REGISTER_ENUM(AudioTime);
+       REGISTER_ENUM(MusicTime);
+       REGISTER(_PositionLockStyle);
 }
 
+} /* namespace ARDOUR */
+
 /* deserializing types from ardour/types.h */
 
 std::istream& operator>>(std::istream& o, HeaderFormat& var) 
@@ -676,6 +664,20 @@ std::ostream& operator<<(std::ostream& o, const LayerModel& var)
        std::string s = enum_2_string (var);
        return o << s;
 }
+
+std::istream& operator>>(std::istream& o, InsertMergePolicy& var) 
+{ 
+       std::string s;
+       o >> s;
+       var = (InsertMergePolicy) string_2_enum (s, var);
+       return o;
+}
+std::ostream& operator<<(std::ostream& o, const InsertMergePolicy& var) 
+{ 
+       std::string s = enum_2_string (var);
+       return o << s;
+}
+
 std::istream& operator>>(std::istream& o, CrossfadeModel& var) 
 { 
        std::string s;
@@ -780,3 +782,17 @@ std::ostream& operator<<(std::ostream& o, const WaveformShape& var)
        std::string s = enum_2_string (var);
        return o << s;
 }
+
+std::istream& operator>>(std::istream& o, PositionLockStyle& var) 
+{ 
+       std::string s;
+       o >> s;
+       var = (PositionLockStyle) string_2_enum (s, var);
+       return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const PositionLockStyle& var) 
+{ 
+       std::string s = enum_2_string (var);
+       return o << s;
+}
Unnamed repository; edit this file 'description' to name the repository.