X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fediting.cc;h=70a71ee08250a2ca188ee7164ef33e22a8078de4;hb=842c33fba81ee7d360bb347a9a011582f6aac95f;hp=672c1ab7411d391d524c770da6c84ddf3d1cf8a1;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/editing.cc b/gtk2_ardour/editing.cc
index 672c1ab741..70a71ee082 100644
--- a/gtk2_ardour/editing.cc
+++ b/gtk2_ardour/editing.cc
@@ -1,7 +1,28 @@
-#include <string>
+/*
+    Copyright (C) 2000-2007 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <cstring>
 
 #include "editing.h"
 
+#include "pbd/i18n.h"
+
 using namespace std;
 
 // This involves some cpp magic. --taybin
@@ -10,6 +31,7 @@ using namespace std;
 #define SNAPMODE(a) /*empty*/
 #define REGIONLISTSORTTYPE(a) /*empty*/
 #define MOUSEMODE(a) /*empty*/
+#define MIDIEDITMODE(a) /*empty*/
 #define ZOOMFOCUS(a) /*empty*/
 #define DISPLAYCONTROL(a) /*empty*/
 
@@ -19,11 +41,18 @@ namespace Editing {
 #undef SNAPTYPE
 #define SNAPTYPE(s) if (!strcmp(type, #s)) {return s;}
 SnapType
-str2snaptype (string 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 +60,38 @@ str2snaptype (string str) {
 #undef SNAPMODE
 #define SNAPMODE(s) if (!strcmp(type, #s)) {return s;}
 SnapMode
-str2snapmode (string 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 (string 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 +99,18 @@ str2regionlistsorttype (string str) {
 #undef MOUSEMODE
 #define MOUSEMODE(s) if (!strcmp(type, #s)) {return s;}
 MouseMode
-str2mousemode (string 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 +118,18 @@ str2mousemode (string str) {
 #undef ZOOMFOCUS
 #define ZOOMFOCUS(s) if (!strcmp(type, #s)) {return s;}
 ZoomFocus
-str2zoomfocus (string 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 +137,30 @@ str2zoomfocus (string str) {
 #undef DISPLAYCONTROL
 #define DISPLAYCONTROL(s) if (!strcmp(type, #s)) {return s;}
 DisplayControl
-str2displaycontrol (string 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 (string 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
+