Use sigc::slots rather than templates + function ptrs for a foreach_region and foreac...

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

diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 0c307d060565239caeb1b0d12bc07bcfa19f61ba..7767381499d6b73c4f7e40e949581dd5e5d34c59 100644 (file)
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -17,21 +17,22 @@
 
 */
 
-#include <pbd/enumwriter.h>
-
-#include <ardour/types.h>
-#include <ardour/session.h>
-#include <ardour/location.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/diskstream.h>
-#include <ardour/audioregion.h>
-#include <ardour/route_group.h>
-#include <ardour/panner.h>
-#include <ardour/track.h>
-#include <ardour/midi_track.h>
-#include <ardour/export_filename.h>
-#include <ardour/export_format_base.h>
-#include <ardour/export_profile_manager.h>
+#include "pbd/enumwriter.h"
+
+#include "ardour/types.h"
+#include "ardour/delivery.h"
+#include "ardour/session.h"
+#include "ardour/location.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/diskstream.h"
+#include "ardour/audioregion.h"
+#include "ardour/route_group.h"
+#include "ardour/panner.h"
+#include "ardour/track.h"
+#include "ardour/midi_track.h"
+#include "ardour/export_filename.h"
+#include "ardour/export_format_base.h"
+#include "ardour/export_profile_manager.h"
 
 using namespace std;
 using namespace PBD;
@@ -83,7 +84,7 @@ setup_enum_writer ()
        AutoConnectOption _AutoConnectOption;
        Session::StateOfTheState _Session_StateOfTheState;
        Route::Flag _Route_Flag;
-       AudioFileSource::Flag _AudioFileSource_Flag;
+       Source::Flag _Source_Flag;
        Diskstream::Flag _Diskstream_Flag;
        Location::Flags _Location_Flags;
        RouteGroup::Flag _RouteGroup_Flag;
@@ -103,6 +104,7 @@ setup_enum_writer ()
        ExportFormatBase::SampleRate _ExportFormatBase_SampleRate;
        ExportFormatBase::SRCQuality _ExportFormatBase_SRCQuality;
        ExportProfileManager::TimeFormat _ExportProfileManager_TimeFormat;
+       Delivery::Role _Delivery_Role;
 
 #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()
@@ -152,6 +154,7 @@ setup_enum_writer ()
        REGISTER (_MeterPoint);
 
        REGISTER_ENUM (Normal);
+       REGISTER_ENUM (NonLayered);
        REGISTER_ENUM (Destructive);
        REGISTER (_TrackMode);
 
@@ -336,15 +339,15 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (Route, ControlOut);
        REGISTER_BITS (_Route_Flag);
 
-       REGISTER_CLASS_ENUM (AudioFileSource, Writable);
-       REGISTER_CLASS_ENUM (AudioFileSource, CanRename);
-       REGISTER_CLASS_ENUM (AudioFileSource, Broadcast);
-       REGISTER_CLASS_ENUM (AudioFileSource, Removable);
-       REGISTER_CLASS_ENUM (AudioFileSource, RemovableIfEmpty);
-       REGISTER_CLASS_ENUM (AudioFileSource, RemoveAtDestroy);
-       REGISTER_CLASS_ENUM (AudioFileSource, NoPeakFile);
-       REGISTER_CLASS_ENUM (AudioFileSource, Destructive);
-       REGISTER_BITS (_AudioFileSource_Flag);
+       REGISTER_CLASS_ENUM (Source, Writable);
+       REGISTER_CLASS_ENUM (Source, CanRename);
+       REGISTER_CLASS_ENUM (Source, Broadcast);
+       REGISTER_CLASS_ENUM (Source, Removable);
+       REGISTER_CLASS_ENUM (Source, RemovableIfEmpty);
+       REGISTER_CLASS_ENUM (Source, RemoveAtDestroy);
+       REGISTER_CLASS_ENUM (Source, NoPeakFile);
+       REGISTER_CLASS_ENUM (Source, Destructive);
+       REGISTER_BITS (_Source_Flag);
 
        REGISTER_CLASS_ENUM (AudioRegion, Linear);
        REGISTER_CLASS_ENUM (AudioRegion, Fast);
@@ -498,4 +501,10 @@ setup_enum_writer ()
        REGISTER_CLASS_ENUM (ExportProfileManager, Frames);
        REGISTER_CLASS_ENUM (ExportProfileManager, Off);
        REGISTER (_ExportProfileManager_TimeFormat);
+
+       REGISTER_CLASS_ENUM (Delivery, Solo);
+       REGISTER_CLASS_ENUM (Delivery, Send);
+       REGISTER_CLASS_ENUM (Delivery, Listen);
+       REGISTER_CLASS_ENUM (Delivery, Main);
+       REGISTER_BITS (_Delivery_Role);
 }