fix incorrect accumulation of export video options each time the dialog is used

[ardour.git] / gtk2_ardour / editing.h

diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h
index 2b4519ec9c6c464cb44818a159d8c8bc5000b78a..1145e76b40ddcb98b14234cd505d35b0532fab4d 100644 (file)
--- a/gtk2_ardour/editing.h
+++ b/gtk2_ardour/editing.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,11 +22,11 @@
 
 #include <string>
 #include <map>
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 // This involves some cpp magic. --taybin
 
-#define SNAPTYPE(a) /*empty*/
+#define GRIDTYPE(a) /*empty*/
 #define SNAPMODE(a) /*empty*/
 #define REGIONLISTSORTTYPE(a) /*empty*/
 #define MOUSEMODE(a) /*empty*/
@@ -37,22 +37,25 @@
 #define IMPORTPOSITION(a)
 #define IMPORTDISPOSITION(a)
 #define EDITPOINT(a) /*empty*/
+#define WAVEFORMSCALE(a) /*empty*/
+#define WAVEFORMSHAPE(a) /*empty*/
+#define INSERTTIMEOPT(a) /*empty*/
 
 namespace Editing {
 
-// SNAPTYPE
-#undef SNAPTYPE
-#define SNAPTYPE(a) a,
-enum SnapType {
+// GRIDTYPE
+#undef GRIDTYPE
+#define GRIDTYPE(a) a,
+enum GridType {
        #include "editing_syms.h"
 };
 
-extern const char *snaptypestrs[];
-inline const char* enum2str(SnapType m) {return snaptypestrs[m];}
-SnapType str2snaptype(const std::string &);
+extern const char *gridtypestrs[];
+inline const char* enum2str(GridType m) {return gridtypestrs[m];}
+GridType str2gridtype(const std::string &);
 
-#undef SNAPTYPE
-#define SNAPTYPE(a) /*empty*/
+#undef GRIDTYPE
+#define GRIDTYPE(a) /*empty*/
 
 // SNAPMODE
 #undef SNAPMODE
@@ -179,9 +182,21 @@ enum EditPoint {
 #undef EDITPOINT
 #define EDITPOINT(a) /*empty*/
 
+// INSERTTIMEOPT
+#undef INSERTTIMEOPT
+#define INSERTTIMEOPT(a) a,
+enum InsertTimeOption {
+       #include "editing_syms.h"
+};
+
+#undef INSERTTIMEOPT
+#define INSERTTIMEOPT(a) /*empty*/
+
+
 /////////////////////
 // These don't need their state saved. yet...
 enum CutCopyOp {
+       Delete,
        Cut,
        Copy,
        Clear
@@ -193,6 +208,26 @@ enum XFadeType {
        At
 };
 
+enum EditIgnoreOption {
+       EDIT_IGNORE_NONE,
+       EDIT_IGNORE_PHEAD,
+       EDIT_IGNORE_MOUSE,
+       EDIT_IGNORE_MARKER
+};
+
+enum ZoomAxis {
+       Vertical,
+       Horizontal,
+       Both
+};
+
+enum RegionActionTarget {
+       SelectedRegions = 0x1,
+       EnteredRegions = 0x2,
+       EditPointRegions = 0x4,
+       ListSelection = 0x8
+};
+
 } // namespace Editing
 
 #endif // __gtk_ardour_editing_h__