Merge with 2.0-ongoing R2988

[ardour.git] / gtk2_ardour / enums.cc

diff --git a/gtk2_ardour/enums.cc b/gtk2_ardour/enums.cc
index 9943d5225808650523571b48d16c786e96381cea..f626bfb968c4d275c8f9b5b84c732672f4f6b6a7 100644 (file)
--- a/gtk2_ardour/enums.cc
+++ b/gtk2_ardour/enums.cc
@@ -20,10 +20,13 @@
 #include <pbd/enumwriter.h>
 
 #include "audio_clock.h"
+#include "editing.h"
+#include "enums.h"
 
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace Editing;
 
 void
 setup_gtk_ardour_enums ()
@@ -33,6 +36,9 @@ setup_gtk_ardour_enums ()
        vector<string> s;
 
        AudioClock::Mode clock_mode;
+       Width width;
+       ImportMode import_mode;
+       EditPoint edit_point;
 
 #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()
@@ -45,4 +51,19 @@ setup_gtk_ardour_enums ()
        REGISTER_CLASS_ENUM (AudioClock, Frames);
        REGISTER_CLASS_ENUM (AudioClock, Off);
        REGISTER (clock_mode);
+
+       REGISTER_ENUM (Wide);
+       REGISTER_ENUM (Narrow);
+       REGISTER (width);
+
+       REGISTER_ENUM (ImportAsTrack);
+       REGISTER_ENUM (ImportToTrack);
+       REGISTER_ENUM (ImportAsRegion);
+       REGISTER_ENUM (ImportAsTapeTrack);
+       REGISTER (import_mode);
+
+       REGISTER_ENUM (EditAtPlayhead);
+       REGISTER_ENUM (EditAtMouse);
+       REGISTER_ENUM (EditAtSelectedMarker);
+       REGISTER (edit_point);
 }