diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-10-11 22:07:47 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-10-11 22:07:47 +0000 |
| commit | f7f9d6fdc40248b190ec9c6e1a886261d55777ae (patch) | |
| tree | 080723e9dc35a66013b37acbafc67a6afa929302 /gtk2_ardour/editing.h | |
| parent | aa1f736a651376534acaa2268b65d42a3786fff7 (diff) | |
merge from 2.0-ongoing by hand, minus key binding editor
git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editing.h')
| -rw-r--r-- | gtk2_ardour/editing.h | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h index d7f8f6ece8..93bbb603ee 100644 --- a/gtk2_ardour/editing.h +++ b/gtk2_ardour/editing.h @@ -34,6 +34,8 @@ #define ZOOMFOCUS(a) /*empty*/ #define DISPLAYCONTROL(a) /*empty*/ #define IMPORTMODE(a) /*empty*/ +#define IMPORTPOSITION(a) +#define IMPORTDISPOSITION(a) namespace Editing { @@ -135,6 +137,7 @@ DisplayControl str2displaycontrol (const std::string &); #undef DISPLAYCONTROL #define DISPLAYCONTROL(a) /*empty*/ + // IMPORTMODE #undef IMPORTMODE #define IMPORTMODE(a) a, @@ -142,13 +145,29 @@ 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*/ + ///////////////////// // These don't need their state saved. yet... enum CutCopyOp { |