optimization for track with zero audio channels should not short-circuit MIDI disk...

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index bd7c2dd39b425ebf09fb91f9ebd807f676a3018f..09ae6db6b7e95bf1fcd5cb522f4e05c3d57b920a 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -23,7 +23,7 @@
 #include "evoral/Range.hpp" // shouldn't Evoral have its own enum registration?
 
 #include "ardour/delivery.h"
-#include "ardour/diskstream.h"
+#include "ardour/disk_io.h"
 #include "ardour/export_channel.h"
 #include "ardour/export_filename.h"
 #include "ardour/export_format_base.h"
@@ -58,6 +58,7 @@ setup_enum_writer ()
        AlignStyle _AlignStyle;
        AlignChoice _AlignChoice;
        MeterPoint _MeterPoint;
+       DiskIOPoint _DiskIOPoint;
        MeterType _MeterType;
        TrackMode _TrackMode;
        NoteMode _NoteMode;
@@ -100,7 +101,7 @@ setup_enum_writer ()
        TracksAutoNamingRule _TracksAutoNamingRule;
        Session::StateOfTheState _Session_StateOfTheState;
        Source::Flag _Source_Flag;
-       Diskstream::Flag _Diskstream_Flag;
+       DiskIOProcessor::Flag _DiskIOProcessor_Flag;
        Location::Flags _Location_Flags;
        PositionLockStyle _PositionLockStyle;
        TempoSection::Type _TempoSection_Type;
@@ -131,7 +132,7 @@ setup_enum_writer ()
        Session::SlaveState _Session_SlaveState;
        MTC_Status _MIDI_MTC_Status;
        Evoral::OverlapType _OverlapType;
-    BufferingPreset _BufferingPreset;
+       BufferingPreset _BufferingPreset;
        AutoReturnTarget _AutoReturnTarget;
        PresentationInfo::Flag _PresentationInfo_Flag;
        MusicalMode::Type mode;
@@ -142,6 +143,12 @@ setup_enum_writer ()
 #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)
 
+       /* in mid-2017 the entire code base was changed to use "samples"
+          instead of frames, which included several enums. This hack table
+          entry will catch all of them.
+       */
+       enum_writer.add_to_hack_table ("Frames", "Samples");
+
        REGISTER_ENUM (NullAutomation);
        REGISTER_ENUM (GainAutomation);
        REGISTER_ENUM (PanAzimuthAutomation);
@@ -177,6 +184,7 @@ setup_enum_writer ()
        REGISTER_ENUM (Write);
        REGISTER_ENUM (Touch);
        REGISTER_ENUM (Play);
+       REGISTER_ENUM (Latch);
        REGISTER_BITS (_AutoState);
 
        REGISTER_ENUM (CaptureTime);
@@ -195,6 +203,11 @@ setup_enum_writer ()
        REGISTER_ENUM (MeterCustom);
        REGISTER (_MeterPoint);
 
+       REGISTER_ENUM (DiskIOPreFader);
+       REGISTER_ENUM (DiskIOPostFader);
+       REGISTER_ENUM (DiskIOCustom);
+       REGISTER (_DiskIOPoint);
+
        REGISTER_ENUM (MeterMaxSignal);
        REGISTER_ENUM (MeterMaxPeak);
        REGISTER_ENUM (MeterPeak);
@@ -391,7 +404,6 @@ setup_enum_writer ()
        REGISTER (_Session_RecordState);
 
        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);
@@ -403,7 +415,6 @@ setup_enum_writer ()
        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, CancelPlayAudioRange);
        REGISTER_CLASS_ENUM (SessionEvent, RealTimeOperation);
@@ -506,10 +517,10 @@ setup_enum_writer ()
        REGISTER_ENUM(ExistingNewlyCreatedBoth);
        REGISTER (_RegionSelectionAfterSplit);
 
-       REGISTER_CLASS_ENUM (Diskstream, Recordable);
-       REGISTER_CLASS_ENUM (Diskstream, Hidden);
-       REGISTER_CLASS_ENUM (Diskstream, Destructive);
-       REGISTER_BITS (_Diskstream_Flag);
+       REGISTER_CLASS_ENUM (DiskIOProcessor, Recordable);
+       REGISTER_CLASS_ENUM (DiskIOProcessor, Hidden);
+       REGISTER_CLASS_ENUM (DiskIOProcessor, Destructive);
+       REGISTER_BITS (_DiskIOProcessor_Flag);
 
        REGISTER_CLASS_ENUM (Location, IsMark);
        REGISTER_CLASS_ENUM (Location, IsAutoPunch);
@@ -539,7 +550,7 @@ setup_enum_writer ()
 
        REGISTER_CLASS_ENUM (AnyTime, Timecode);
        REGISTER_CLASS_ENUM (AnyTime, BBT);
-       REGISTER_CLASS_ENUM (AnyTime, Frames);
+       REGISTER_CLASS_ENUM (AnyTime, Samples);
        REGISTER_CLASS_ENUM (AnyTime, Seconds);
        REGISTER (_AnyTime_Type);
 
@@ -622,7 +633,7 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (ExportProfileManager, Timecode);
        REGISTER_CLASS_ENUM (ExportProfileManager, BBT);
        REGISTER_CLASS_ENUM (ExportProfileManager, MinSec);
-       REGISTER_CLASS_ENUM (ExportProfileManager, Frames);
+       REGISTER_CLASS_ENUM (ExportProfileManager, Samples);
        REGISTER (_ExportProfileManager_TimeFormat);
 
        REGISTER_CLASS_ENUM (RegionExportChannelFactory, None);