fix conflicts caused by meterbridge merge

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index eea971e197808466758c68106642dc1d67477888..495ff0b4c350d5e1e953bc17b04f53513edce7e2 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -20,22 +20,20 @@
 #include "pbd/enumwriter.h"
 #include "midi++/types.h"
 
-#include "ardour/audiofilesource.h"
-#include "ardour/audioregion.h"
+#include "evoral/Range.hpp" // shouldn't Evoral have its own enum registration?
+
 #include "ardour/delivery.h"
 #include "ardour/diskstream.h"
+#include "ardour/export_channel.h"
 #include "ardour/export_filename.h"
 #include "ardour/export_format_base.h"
 #include "ardour/export_profile_manager.h"
-#include "ardour/export_channel_configuration.h"
 #include "ardour/io.h"
 #include "ardour/location.h"
 #include "ardour/midi_model.h"
-#include "ardour/midi_track.h"
 #include "ardour/mute_master.h"
-#include "ardour/panner.h"
-#include "ardour/route_group.h"
 #include "ardour/session.h"
+#include "ardour/source.h"
 #include "ardour/track.h"
 #include "ardour/types.h"
 
@@ -43,6 +41,7 @@ using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
 using namespace MIDI;
+using namespace Timecode;
 
 namespace ARDOUR {
 
@@ -56,12 +55,14 @@ setup_enum_writer ()
        AlignStyle _AlignStyle;
        AlignChoice _AlignChoice;
        MeterPoint _MeterPoint;
+       MeterType _MeterType;
        TrackMode _TrackMode;
        NoteMode _NoteMode;
        ChannelMode _ChannelMode;
        ColorMode _ColorMode;
        MeterFalloff _MeterFalloff;
        MeterHold _MeterHold;
+       MeterLineUp _MeterLineUp;
        EditMode _EditMode;
        RegionPoint _RegionPoint;
        Placement _Placement;
@@ -93,6 +94,7 @@ setup_enum_writer ()
        AutoState _AutoState;
        AutoStyle _AutoStyle;
        AutoConnectOption _AutoConnectOption;
+       RouteSortOrderKey _RouteSortOrderKey;
        Session::StateOfTheState _Session_StateOfTheState;
        Route::Flag _Route_Flag;
        Source::Flag _Source_Flag;
@@ -122,10 +124,10 @@ setup_enum_writer ()
        MidiModel::PatchChangeDiffCommand::Property _MidiModel_PatchChangeDiffCommand_Property;
        WaveformScale _WaveformScale;
        WaveformShape _WaveformShape;
-       QuantizeType _QuantizeType;
        Session::PostTransportWork _Session_PostTransportWork;
        Session::SlaveState _Session_SlaveState;
        MTC_Status _MIDI_MTC_Status;
+       Evoral::OverlapType _OverlapType;
 
 #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()
@@ -171,6 +173,12 @@ setup_enum_writer ()
        REGISTER_ENUM (MeterCustom);
        REGISTER (_MeterPoint);
 
+       REGISTER_ENUM (MeterMaxSignal);
+       REGISTER_ENUM (MeterMaxPeak);
+       REGISTER_ENUM (MeterPeak);
+       REGISTER_ENUM (MeterKrms);
+       REGISTER (_MeterType);
+
        REGISTER_ENUM (Normal);
        REGISTER_ENUM (NonLayered);
        REGISTER_ENUM (Destructive);
@@ -193,6 +201,8 @@ setup_enum_writer ()
        REGISTER_ENUM (MeterFalloffOff);
        REGISTER_ENUM (MeterFalloffSlowest);
        REGISTER_ENUM (MeterFalloffSlow);
+       REGISTER_ENUM (MeterFalloffSlowish);
+       REGISTER_ENUM (MeterFalloffModerate);
        REGISTER_ENUM (MeterFalloffMedium);
        REGISTER_ENUM (MeterFalloffFast);
        REGISTER_ENUM (MeterFalloffFaster);
@@ -205,6 +215,12 @@ setup_enum_writer ()
        REGISTER_ENUM (MeterHoldLong);
        REGISTER (_MeterHold);
 
+       REGISTER_ENUM (MeteringLineUp24);
+       REGISTER_ENUM (MeteringLineUp20);
+       REGISTER_ENUM (MeteringLineUp18);
+       REGISTER_ENUM (MeteringLineUp15);
+       REGISTER (_MeterLineUp);
+
        REGISTER_ENUM (Slide);
        REGISTER_ENUM (Splice);
        REGISTER_ENUM (Lock);
@@ -307,6 +323,7 @@ setup_enum_writer ()
        REGISTER_ENUM (MTC);
        REGISTER_ENUM (JACK);
        REGISTER_ENUM (MIDIClock);
+       REGISTER_ENUM (LTC);
        REGISTER (_SyncSource);
 
        REGISTER_ENUM (Sprung);
@@ -397,11 +414,15 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Session, pullup_Minus4Minus1);
        REGISTER (_Session_PullupFormat);
 
-       REGISTER_CLASS_ENUM (Route, Hidden);
+       REGISTER_CLASS_ENUM (Route, Auditioner);
        REGISTER_CLASS_ENUM (Route, MasterOut);
        REGISTER_CLASS_ENUM (Route, MonitorOut);
        REGISTER_BITS (_Route_Flag);
 
+       REGISTER_ENUM (MixerSort);
+       REGISTER_ENUM (EditorSort);
+       REGISTER (_RouteSortOrderKey);
+
        REGISTER_CLASS_ENUM (Source, Writable);
        REGISTER_CLASS_ENUM (Source, CanRename);
        REGISTER_CLASS_ENUM (Source, Broadcast);
@@ -415,10 +436,8 @@ setup_enum_writer ()
        REGISTER_ENUM (FadeLinear);
        REGISTER_ENUM (FadeFast);
        REGISTER_ENUM (FadeSlow);
-       REGISTER_ENUM (FadeLogA);
-       REGISTER_ENUM (FadeLogB);
-       REGISTER_ENUM (FadeConstantPowerMinus3dB);
-       REGISTER_ENUM (FadeConstantPowerMinus6dB);
+       REGISTER_ENUM (FadeConstantPower);
+       REGISTER_ENUM (FadeSymmetric);
        REGISTER (_FadeShape);
 
        REGISTER_CLASS_ENUM (Diskstream, Recordable);
@@ -510,6 +529,7 @@ setup_enum_writer ()
 
        REGISTER_CLASS_ENUM (ExportFormatBase, SR_None);
        REGISTER_CLASS_ENUM (ExportFormatBase, SR_Session);
+       REGISTER_CLASS_ENUM (ExportFormatBase, SR_8);
        REGISTER_CLASS_ENUM (ExportFormatBase, SR_22_05);
        REGISTER_CLASS_ENUM (ExportFormatBase, SR_44_1);
        REGISTER_CLASS_ENUM (ExportFormatBase, SR_48);
@@ -577,14 +597,16 @@ setup_enum_writer ()
        REGISTER_ENUM(Rectified);
        REGISTER(_WaveformShape);
 
-       REGISTER_ENUM(Plain);
-       REGISTER_ENUM(Legato);
-       REGISTER_ENUM(Groove);
-       REGISTER(_QuantizeType);
-
        REGISTER_ENUM(AudioTime);
        REGISTER_ENUM(MusicTime);
        REGISTER(_PositionLockStyle);
+
+       REGISTER_ENUM (Evoral::OverlapNone);
+       REGISTER_ENUM (Evoral::OverlapInternal);
+       REGISTER_ENUM (Evoral::OverlapStart);
+       REGISTER_ENUM (Evoral::OverlapEnd);
+       REGISTER_ENUM (Evoral::OverlapExternal);
+       REGISTER(_OverlapType);
 }
 
 } /* namespace ARDOUR */
@@ -646,6 +668,20 @@ std::ostream& operator<<(std::ostream& o, const MonitorModel& var)
        return o << s;
 }
 
+std::istream& operator>>(std::istream& o, MeterLineUp& var)
+{
+       std::string s;
+       o >> s;
+       var = (MeterLineUp) string_2_enum (s, var);
+       return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const MeterLineUp& var)
+{
+       std::string s = enum_2_string (var);
+       return o << s;
+}
+
 std::istream& operator>>(std::istream& o, PFLPosition& var)
 {
        std::string s;
@@ -860,3 +896,17 @@ std::ostream& operator<<(std::ostream& o, const PositionLockStyle& var)
        std::string s = enum_2_string (var);
        return o << s;
 }
+
+std::istream& operator>>(std::istream& o, Evoral::OverlapType& var)
+{
+       std::string s;
+       o >> s;
+       var = (Evoral::OverlapType) string_2_enum (s, var);
+       return o;
+}
+
+std::ostream& operator<<(std::ostream& o, const Evoral::OverlapType& var)
+{
+       std::string s = enum_2_string (var);
+       return o << s;
+}