X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fediting.h;h=8dd6f2ed6c3587266fa694dca9ff6bd29d1d507d;hb=234b06a18cf3e8c07bc44fb4f8c1218e17fb65f1;hp=2b4519ec9c6c464cb44818a159d8c8bc5000b78a;hpb=badc087263990ecf360792c10e4d9f2d60828d43;p=ardour.git diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h index 2b4519ec9c..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 #include -#include +#include "ardour/types.h" // This involves some cpp magic. --taybin @@ -37,6 +37,9 @@ #define IMPORTPOSITION(a) #define IMPORTDISPOSITION(a) #define EDITPOINT(a) /*empty*/ +#define WAVEFORMSCALE(a) /*empty*/ +#define WAVEFORMSHAPE(a) /*empty*/ +#define INSERTTIMEOPT(a) /*empty*/ namespace Editing { @@ -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,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__