remove UUIDs as implemention of PBD::ID, use static counter (not finished - counter...

[ardour.git] / gtk2_ardour / editing.h

diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h
index 56d260d51382a79e9b11273a92fd749da5352a80..b25b935ee03fbe3ac11d1a4dce3340728d622c63 100644 (file)
--- a/gtk2_ardour/editing.h
+++ b/gtk2_ardour/editing.h
@@ -13,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 {
 
@@ -125,22 +125,23 @@ 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 (const 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...
@@ -156,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__