X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fediting.cc;h=34378a332d03cee5e43d2ec948b424a7e2c20e44;hb=60b97472b1e99c75fe68dd20de59d105c09b6c4e;hp=5ceb82f6c7ec103e9f8d4cdc7b3a7835b4022e6c;hpb=170d6b24cec9b7fe51d74b75544a097948e03082;p=ardour.git

diff --git a/gtk2_ardour/editing.cc b/gtk2_ardour/editing.cc
index 5ceb82f6c7..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
@@ -19,11 +21,18 @@ namespace Editing {
 #undef SNAPTYPE
 #define SNAPTYPE(s) if (!strcmp(type, #s)) {return s;}
 SnapType
-str2snaptype (ARDOUR::stringcr_t str) {
+str2snaptype (const string & str) {
 	const char* type = str.c_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*/
 
@@ -31,23 +40,38 @@ str2snaptype (ARDOUR::stringcr_t str) {
 #undef SNAPMODE
 #define SNAPMODE(s) if (!strcmp(type, #s)) {return s;}
 SnapMode
-str2snapmode (ARDOUR::stringcr_t str) {
+str2snapmode (const string & str) {
 	const char* type = str.c_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;}
 RegionListSortType
-str2regionlistsorttype (ARDOUR::stringcr_t str) {
+str2regionlistsorttype (const string & str) {
 	const char* type = str.c_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*/
 
@@ -55,11 +79,18 @@ str2regionlistsorttype (ARDOUR::stringcr_t str) {
 #undef MOUSEMODE
 #define MOUSEMODE(s) if (!strcmp(type, #s)) {return s;}
 MouseMode
-str2mousemode (ARDOUR::stringcr_t str) {
+str2mousemode (const string & str) {
 	const char* type = str.c_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*/
 
@@ -67,11 +98,18 @@ str2mousemode (ARDOUR::stringcr_t str) {
 #undef ZOOMFOCUS
 #define ZOOMFOCUS(s) if (!strcmp(type, #s)) {return s;}
 ZoomFocus
-str2zoomfocus (ARDOUR::stringcr_t str) {
+str2zoomfocus (const string & str) {
 	const char* type = str.c_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*/
 
@@ -79,26 +117,30 @@ str2zoomfocus (ARDOUR::stringcr_t str) {
 #undef DISPLAYCONTROL
 #define DISPLAYCONTROL(s) if (!strcmp(type, #s)) {return s;}
 DisplayControl
-str2displaycontrol (ARDOUR::stringcr_t str) {
+str2displaycontrol (const string & str) {
 	const char* type = str.c_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*/
 
-// COLORID
-#undef COLORID
-#define COLORID(s) if (!strcmp(type, #s)) {return s;}
-ColorID
-str2color_id (ARDOUR::stringcr_t str) {
-	const char* type = str.c_str();
+//IMPORTMODE
+#undef IMPORTMODE
+#define IMPORTMODE(s) N_(#s),
+const char *importmodestrs[] = {
 	#include "editing_syms.h"
-	return cFrameHandleEndOutline;
-}
-#undef COLORID
-#define COLORID(a) /*empty*/
-
-ColorMap color_map;
+	0
+};
+#undef IMPORTMODE
+#define IMPORTMODE(a) /*empty*/
 
 } // namespace Editing
+