diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-01 17:41:28 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-01 17:41:28 +0000 |
commit | a0e85682664b612e555c5757cac3945acc2e8034 (patch) | |
tree | 67fd48f8917e9cea003e144b12bb79c73d3a2ad9 /gtk2_ardour/editing.cc | |
parent | 2001efa08838b4dd839cc5b4f6aa3203c4441c5f (diff) |
fix crashing bug caused by recursive set_state() nonsense; sync snap_type, snap_mode, zoom_focus GUI elements; minor tweaks
git-svn-id: svn://localhost/ardour2/trunk@1048 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editing.cc')
-rw-r--r-- | gtk2_ardour/editing.cc | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/gtk2_ardour/editing.cc b/gtk2_ardour/editing.cc index 1513856ea6..34378a332d 100644 --- a/gtk2_ardour/editing.cc +++ b/gtk2_ardour/editing.cc @@ -2,6 +2,8 @@ #include "editing.h" +#include "i18n.h" + using namespace std; // This involves some cpp magic. --taybin @@ -24,6 +26,13 @@ str2snaptype (const string & str) { #include "editing_syms.h" return SnapToBar; } + +#undef SNAPTYPE +#define SNAPTYPE(s) N_(#s), +const char *snaptypestrs[] = { + #include "editing_syms.h" + 0 +}; #undef SNAPTYPE #define SNAPTYPE(a) /*empty*/ @@ -36,9 +45,17 @@ str2snapmode (const string & str) { #include "editing_syms.h" return SnapNormal; } + +#undef SNAPMODE +#define SNAPMODE(s) N_(#s), +const char *snapmodestrs[] = { + #include "editing_syms.h" + 0 +}; #undef SNAPMODE #define SNAPMODE(a) /*empty*/ + // REGIONLISTSORTTYPE #undef REGIONLISTSORTTYPE #define REGIONLISTSORTTYPE(s) if (!strcmp(type, #s)) {return s;} @@ -48,6 +65,13 @@ str2regionlistsorttype (const string & str) { #include "editing_syms.h" return ByName; } + +#undef REGIONLISTSORTTYPE +#define REGIONLISTSORTTYPE(s) N_(#s), +const char *regionlistsorttypestrs[] = { + #include "editing_syms.h" + 0 +}; #undef REGIONLISTSORTTYPE #define REGIONLISTSORTTYPE(a) /*empty*/ @@ -60,6 +84,13 @@ str2mousemode (const string & str) { #include "editing_syms.h" return MouseObject; } + +#undef MOUSEMODE +#define MOUSEMODE(s) N_(#s), +const char *mousemodestrs[] = { + #include "editing_syms.h" + 0 +}; #undef MOUSEMODE #define MOUSEMODE(a) /*empty*/ @@ -72,6 +103,13 @@ str2zoomfocus (const string & str) { #include "editing_syms.h" return ZoomFocusPlayhead; } + +#undef ZOOMFOCUS +#define ZOOMFOCUS(s) N_(#s), +const char *zoomfocusstrs[] = { + #include "editing_syms.h" + 0 +}; #undef ZOOMFOCUS #define ZOOMFOCUS(a) /*empty*/ @@ -84,7 +122,25 @@ str2displaycontrol (const string & str) { #include "editing_syms.h" return FollowPlayhead; } + +#undef DISPLAYCONTROL +#define DISPLAYCONTROL(s) N_(#s), +const char *displaycontrolstrs[] = { + #include "editing_syms.h" + 0 +}; #undef DISPLAYCONTROL #define DISPLAYCONTROL(a) /*empty*/ +//IMPORTMODE +#undef IMPORTMODE +#define IMPORTMODE(s) N_(#s), +const char *importmodestrs[] = { + #include "editing_syms.h" + 0 +}; +#undef IMPORTMODE +#define IMPORTMODE(a) /*empty*/ + } // namespace Editing + |