make note overlap resolution store side effects in a DiffCommand, and add its changes...

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 8a2ccfe79c63835a570149db3444b7b4681dee8e..3f7fee3aeeae872ee6780ff440b6402e4b9b9c73 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -290,7 +290,7 @@ setup_enum_writer ()
        REGISTER (_Session_RecordState);
 
        REGISTER_CLASS_ENUM (SessionEvent, SetTransportSpeed);
-       REGISTER_CLASS_ENUM (SessionEvent, SetDiskstreamSpeed);
+       REGISTER_CLASS_ENUM (SessionEvent, SetTrackSpeed);
        REGISTER_CLASS_ENUM (SessionEvent, Locate);
        REGISTER_CLASS_ENUM (SessionEvent, LocateRoll);
        REGISTER_CLASS_ENUM (SessionEvent, LocateRollLocate);
@@ -370,7 +370,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);
@@ -400,9 +400,8 @@ 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 (Panner, SameDirection);
@@ -514,7 +513,6 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Delivery, Listen);
        REGISTER_CLASS_ENUM (Delivery, Main);
        REGISTER_CLASS_ENUM (Delivery, Aux);
-       REGISTER_CLASS_ENUM (Delivery, MainListen);
        REGISTER_BITS (_Delivery_Role);
 
        REGISTER_CLASS_ENUM (MuteMaster, PreFader);