diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-17 20:54:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-17 20:54:03 +0000 |
| commit | 997e4b1f9cd7ccfc704b7c035051da7f60d831e7 (patch) | |
| tree | 1236e40183b677abf4a2882e4cfe8e0a345eb24d /gtk2_ardour/editing.h | |
| parent | 19a4b990325577fc949ccd5d5fbad4520eb1df56 (diff) | |
merge with 2.0-ongoing @ rev 3147
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editing.h')
| -rw-r--r-- | gtk2_ardour/editing.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h index 2b4519ec9c..64ced895db 100644 --- a/gtk2_ardour/editing.h +++ b/gtk2_ardour/editing.h @@ -37,6 +37,8 @@ #define IMPORTPOSITION(a) #define IMPORTDISPOSITION(a) #define EDITPOINT(a) /*empty*/ +#define WAVEFORMSCALE(a) /*empty*/ +#define WAVEFORMSHAPE(a) /*empty*/ namespace Editing { @@ -179,6 +181,27 @@ enum EditPoint { #undef EDITPOINT #define EDITPOINT(a) /*empty*/ +// WAVEFORMSCALE +#undef WAVEFORMSCALE +#define WAVEFORMSCALE(a) a, +enum WaveformScale { + #include "editing_syms.h" +}; + +#undef WAVEFORMSCALE +#define WAVEFORMSCALE(a) /*empty*/ + + +// WAVEFORMSHAPE +#undef WAVEFORMSHAPE +#define WAVEFORMSHAPE(a) a, +enum WaveformShape { + #include "editing_syms.h" +}; + +#undef WAVEFORMSHAPE +#define WAVEFORMSHAPE(a) /*empty*/ + ///////////////////// // These don't need their state saved. yet... enum CutCopyOp { |