diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-08 01:40:25 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-08 01:40:25 +0000 |
commit | badc087263990ecf360792c10e4d9f2d60828d43 (patch) | |
tree | 7e4b7e0afea47be51cbad48f06bb1779f483f56f /gtk2_ardour/editing.h | |
parent | df20e5935fbdaf7d27f924e4e2ea87707d8a2314 (diff) |
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session)
git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editing.h')
-rw-r--r-- | gtk2_ardour/editing.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h index 93bbb603ee..2b4519ec9c 100644 --- a/gtk2_ardour/editing.h +++ b/gtk2_ardour/editing.h @@ -36,6 +36,7 @@ #define IMPORTMODE(a) /*empty*/ #define IMPORTPOSITION(a) #define IMPORTDISPOSITION(a) +#define EDITPOINT(a) /*empty*/ namespace Editing { @@ -168,6 +169,16 @@ enum ImportDisposition { #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*/ + ///////////////////// // These don't need their state saved. yet... enum CutCopyOp { |