new RCU implementation, using an extra layer of indirection allowing us to use g_atom...

[ardour.git] / gtk2_ardour / editing.h

diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h
index 2b95073ef7e5eb836341c61fdc7845c96e5486a8..b25b935ee03fbe3ac11d1a4dce3340728d622c63 100644 (file)
--- a/gtk2_ardour/editing.h
+++ b/gtk2_ardour/editing.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <map>
+#include <ardour/types.h>
 
 // This involves some cpp magic. --taybin
 
@@ -12,7 +13,7 @@
 #define MOUSEMODE(a) /*empty*/
 #define ZOOMFOCUS(a) /*empty*/
 #define DISPLAYCONTROL(a) /*empty*/
-#define COLORID(a) /*empty*/
+#define IMPORTMODE(a) /*empty*/
 
 namespace Editing {
 
@@ -29,7 +30,7 @@ static const char *snaptypestrs[] = {
        #include "editing_syms.h"
 };
 inline const char* enum2str(SnapType m) {return snaptypestrs[m];}
-SnapType str2snaptype(std::string);
+SnapType str2snaptype(const std::string &);
 
 #undef SNAPTYPE
 #define SNAPTYPE(a) /*empty*/
@@ -47,7 +48,7 @@ static const char *snapmodestrs[] = {
        #include "editing_syms.h"
 };
 inline const char* enum2str(SnapMode m) {return snapmodestrs[m];}
-SnapMode str2snapmode(std::string);
+SnapMode str2snapmode(const std::string &);
 
 #undef SNAPMODE
 #define SNAPMODE(a) /*empty*/
@@ -65,7 +66,7 @@ static const char *regionlistsorttypestrs[] = {
        #include "editing_syms.h"
 };
 inline const char* enum2str(RegionListSortType m) {return regionlistsorttypestrs[m];}
-RegionListSortType str2regionlistsorttype(std::string);
+RegionListSortType str2regionlistsorttype(const std::string &);
 
 #undef REGIONLISTSORTTYPE
 #define REGIONLISTSORTTYPE(a) /*empty*/
@@ -83,7 +84,7 @@ static const char *mousemodestrs[] = {
        #include "editing_syms.h"
 };
 inline const char* enum2str(MouseMode m) {return mousemodestrs[m];}
-MouseMode str2mousemode(std::string);
+MouseMode str2mousemode(const std::string &);
 
 #undef MOUSEMODE
 #define MOUSEMODE(a) /*empty*/
@@ -101,7 +102,7 @@ static const char *zoomfocusstrs[] = {
        #include "editing_syms.h"
 };
 inline const char* enum2str(ZoomFocus m) {return zoomfocusstrs[m];}
-ZoomFocus str2zoomfocus(std::string);
+ZoomFocus str2zoomfocus(const std::string &);
 
 #undef ZOOMFOCUS
 #define ZOOMFOCUS(a) /*empty*/
@@ -119,27 +120,28 @@ static const char *displaycontrolstrs[] = {
        #include "editing_syms.h"
 };
 inline const char* enum2str(DisplayControl m) {return displaycontrolstrs[m];}
-DisplayControl str2displaycontrol (std::string);
+DisplayControl str2displaycontrol (const std::string &);
 
 #undef DISPLAYCONTROL
 #define DISPLAYCONTROL(a) /*empty*/
 
-#undef COLORID
-#define COLORID(a) a,
-enum ColorID {
-        #include "editing_syms.h"
+// IMPORTMODE
+#undef IMPORTMODE
+#define IMPORTMODE(a) a,
+enum ImportMode {
+       #include "editing_syms.h"
 };
 
-#undef COLORID
-#define COLORID(s) #s,
-static const char *color_id_strs[] = {
+#undef IMPORTMODE
+#define IMPORTMODE(s) #s,
+static const char *importmodestrs[] = {
        #include "editing_syms.h"
 };
-inline const char* enum2str(ColorID m) {return color_id_strs[m];}
-ColorID str2color_id (std::string);
+inline const char* enum2str(ImportMode m) {return importmodestrs[m];}
+ImportMode str2importmode (const std::string &);
 
-#undef COLORID
-#define COLORID(a) /*empty*/
+#undef IMPORTMODE
+#define IMPORTMODE(a) /*empty*/
 
 /////////////////////
 // These don't need their state saved. yet...
@@ -155,16 +157,6 @@ enum XFadeType {
        At
 };
 
-struct Color {
-    char r;
-    char g;
-    char b;
-    char a;
-};
-
-typedef std::map<Editing::ColorID,int> ColorMap;
-extern ColorMap color_map;
-
 } // namespace Editing
 
 #endif // __gtk_ardour_editing_h__