new color management design starts to take shape (canvas color only for now)

git-svn-id: svn://localhost/trunk/ardour2@326 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 0 insertions, 28 deletions

diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h
index 56d260d513..31da83d984 100644
--- a/gtk2_ardour/editing.h
+++ b/gtk2_ardour/editing.h
@@ -13,7 +13,6 @@
 #define MOUSEMODE(a) /*empty*/
 #define ZOOMFOCUS(a) /*empty*/
 #define DISPLAYCONTROL(a) /*empty*/
-#define COLORID(a) /*empty*/
 
 namespace Editing {
 
@@ -125,23 +124,6 @@ DisplayControl str2displaycontrol (const std::string &);
 #undef DISPLAYCONTROL
 #define DISPLAYCONTROL(a) /*empty*/
 
-#undef COLORID
-#define COLORID(a) a,
-enum ColorID {
-	 #include "editing_syms.h"
-};
-
-#undef COLORID
-#define COLORID(s) #s,
-static const char *color_id_strs[] = {
-	#include "editing_syms.h"
-};
-inline const char* enum2str(ColorID m) {return color_id_strs[m];}
-ColorID str2color_id (const std::string &);
-
-#undef COLORID
-#define COLORID(a) /*empty*/
-
 /////////////////////
 // These don't need their state saved. yet...
 enum CutCopyOp {
@@ -156,16 +138,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__