X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fediting.h;h=8dd6f2ed6c3587266fa694dca9ff6bd29d1d507d;hb=205fbb99ad65b899a5047165422f442d9930103a;hp=0d1078cf16624e48819d5a14aa51410a8db5b817;hpb=666e0870554705f4fb466fc6b188fe9b4000ca49;p=ardour.git

diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h
index 0d1078cf16..8dd6f2ed6c 100644
--- 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,7 +22,7 @@
 
 #include <string>
 #include <map>
-#include <ardour/types.h>
+#include "ardour/types.h"
 
 // This involves some cpp magic. --taybin
 
@@ -30,9 +30,16 @@
 #define SNAPMODE(a) /*empty*/
 #define REGIONLISTSORTTYPE(a) /*empty*/
 #define MOUSEMODE(a) /*empty*/
+#define MIDIEDITMODE(a) /*empty*/
 #define ZOOMFOCUS(a) /*empty*/
 #define DISPLAYCONTROL(a) /*empty*/
 #define IMPORTMODE(a) /*empty*/
+#define IMPORTPOSITION(a)
+#define IMPORTDISPOSITION(a)
+#define EDITPOINT(a) /*empty*/
+#define WAVEFORMSCALE(a) /*empty*/
+#define WAVEFORMSHAPE(a) /*empty*/
+#define INSERTTIMEOPT(a) /*empty*/
 
 namespace Editing {
 
@@ -92,6 +99,20 @@ MouseMode str2mousemode(const std::string &);
 #undef MOUSEMODE
 #define MOUSEMODE(a) /*empty*/
 
+// MIDIEDITMODE
+#undef MIDIEDITMODE
+#define MIDIEDITMODE(a) a,
+enum MidiEditMode {
+	#include "editing_syms.h"
+};
+
+extern const char *midieditmodestrs[];
+inline const char* enum2str(MidiEditMode m) {return midieditmodestrs[m];}
+MidiEditMode str2midieditmode(const std::string &);
+
+#undef MIDIEDITMODE
+#define MIDIEDITMODE(a) /*empty*/
+
 // ZOOMFOCUS
 #undef ZOOMFOCUS
 #define ZOOMFOCUS(a) a,
@@ -120,6 +141,7 @@ DisplayControl str2displaycontrol (const std::string &);
 #undef DISPLAYCONTROL
 #define DISPLAYCONTROL(a) /*empty*/
 
+
 // IMPORTMODE
 #undef IMPORTMODE
 #define IMPORTMODE(a) a,
@@ -127,16 +149,54 @@ enum ImportMode {
 	#include "editing_syms.h"
 };
 
-extern const char *importmodestrs[];
-inline const char* enum2str(ImportMode m) {return importmodestrs[m];}
-ImportMode str2importmode (const std::string &);
-
 #undef IMPORTMODE
 #define IMPORTMODE(a) /*empty*/
 
+// IMPORTPOSITION
+#undef IMPORTPOSITION
+#define IMPORTPOSITION(a) a,
+enum ImportPosition {
+	#include "editing_syms.h"
+};
+
+#undef IMPORTPOSITION
+#define IMPORTPOSITION(a) /*empty*/
+
+// IMPORTDISPOSITION
+#undef IMPORTDISPOSITION
+#define IMPORTDISPOSITION(a) a,
+enum ImportDisposition {
+	#include "editing_syms.h"
+};
+
+#undef IMPORTDISPOSITION
+#define IMPORTDISPOSITION(a) /*empty*/
+
+// EDITPOINT
+#undef EDITPOINT
+#define EDITPOINT(a) a,
+enum EditPoint {
+	#include "editing_syms.h"
+};
+
+#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
@@ -148,6 +208,13 @@ enum XFadeType {
 	At
 };
 
+enum EditIgnoreOption {
+	EDIT_IGNORE_NONE,
+	EDIT_IGNORE_PHEAD,
+	EDIT_IGNORE_MOUSE,
+	EDIT_IGNORE_MARKER
+};
+
 } // namespace Editing
 
 #endif // __gtk_ardour_editing_h__