merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending...

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 9fc1ef96ce9fb1522c97eb7eac8f9b9ee90ebefb..5987c874fbc9e4df88ff382305bcc5d3220a1b07 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -83,7 +83,6 @@ setup_enum_writer ()
        TimecodeFormat _Session_TimecodeFormat;
        Session::PullupFormat _Session_PullupFormat;
        FadeShape _FadeShape;
-       Panner::LinkDirection _Panner_LinkDirection;
        IOChange _IOChange;
        AutomationType _AutomationType;
        AutoState _AutoState;
@@ -114,6 +113,7 @@ setup_enum_writer ()
        MuteMaster::MutePoint _MuteMaster_MutePoint;
        MidiModel::NoteDiffCommand::Property _MidiModel_NoteDiffCommand_Property;
        MidiModel::SysExDiffCommand::Property _MidiModel_SysExDiffCommand_Property;
+       MidiModel::PatchChangeDiffCommand::Property _MidiModel_PatchChangeDiffCommand_Property;
        WaveformScale _WaveformScale;
        WaveformShape _WaveformShape;
        QuantizeType _QuantizeType;
@@ -134,7 +134,9 @@ setup_enum_writer ()
        REGISTER (_OverlapType);
 
        REGISTER_ENUM (GainAutomation);
-       REGISTER_ENUM (PanAutomation);
+       REGISTER_ENUM (PanAzimuthAutomation);
+       REGISTER_ENUM (PanElevationAutomation);
+       REGISTER_ENUM (PanWidthAutomation);
        REGISTER_ENUM (PluginAutomation);
        REGISTER_ENUM (SoloAutomation);
        REGISTER_ENUM (MuteAutomation);
@@ -409,10 +411,6 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Location, IsRangeMarker);
        REGISTER_BITS (_Location_Flags);
 
-       REGISTER_CLASS_ENUM (Panner, SameDirection);
-       REGISTER_CLASS_ENUM (Panner, OppositeDirection);
-       REGISTER (_Panner_LinkDirection);
-
        REGISTER_CLASS_ENUM (Track, NoFreeze);
        REGISTER_CLASS_ENUM (Track, Frozen);
        REGISTER_CLASS_ENUM (Track, UnFrozen);
@@ -536,6 +534,11 @@ setup_enum_writer ()
 
        REGISTER_CLASS_ENUM (MidiModel::SysExDiffCommand, Time);
        REGISTER (_MidiModel_SysExDiffCommand_Property);
+
+       REGISTER_CLASS_ENUM (MidiModel::PatchChangeDiffCommand, Time);
+       REGISTER_CLASS_ENUM (MidiModel::PatchChangeDiffCommand, Program);
+       REGISTER_CLASS_ENUM (MidiModel::PatchChangeDiffCommand, Bank);
+       REGISTER (_MidiModel_PatchChangeDiffCommand_Property);
        
        REGISTER_ENUM(Linear);
        REGISTER_ENUM(Logarithmic);