Decreased region opacity, smoothed out canvas/tempo line colours.

[ardour.git] / gtk2_ardour / editing.h

diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h
index 31da83d984eb5e69f58431ad0f2b846c60ee88d1..05aab747503df7c90ab33aeaa0b081301d2bece4 100644 (file)
--- a/gtk2_ardour/editing.h
+++ b/gtk2_ardour/editing.h
@@ -13,6 +13,7 @@
 #define MOUSEMODE(a) /*empty*/
 #define ZOOMFOCUS(a) /*empty*/
 #define DISPLAYCONTROL(a) /*empty*/
+#define IMPORTMODE(a) /*empty*/
 
 namespace Editing {
 
@@ -23,11 +24,7 @@ enum SnapType {
        #include "editing_syms.h"
 };
 
-#undef SNAPTYPE
-#define SNAPTYPE(s) #s,
-static const char *snaptypestrs[] = {
-       #include "editing_syms.h"
-};
+extern const char *snaptypestrs[];
 inline const char* enum2str(SnapType m) {return snaptypestrs[m];}
 SnapType str2snaptype(const std::string &);
 
@@ -41,11 +38,7 @@ enum SnapMode {
        #include "editing_syms.h"
 };
 
-#undef SNAPMODE
-#define SNAPMODE(s) #s,
-static const char *snapmodestrs[] = {
-       #include "editing_syms.h"
-};
+extern const char *snapmodestrs[];
 inline const char* enum2str(SnapMode m) {return snapmodestrs[m];}
 SnapMode str2snapmode(const std::string &);
 
@@ -59,11 +52,7 @@ enum RegionListSortType {
        #include "editing_syms.h"
 };
 
-#undef REGIONLISTSORTTYPE
-#define REGIONLISTSORTTYPE(s) #s,
-static const char *regionlistsorttypestrs[] = {
-       #include "editing_syms.h"
-};
+extern const char *regionlistsorttypestrs[];
 inline const char* enum2str(RegionListSortType m) {return regionlistsorttypestrs[m];}
 RegionListSortType str2regionlistsorttype(const std::string &);
 
@@ -77,11 +66,7 @@ enum MouseMode {
        #include "editing_syms.h"
 };
 
-#undef MOUSEMODE
-#define MOUSEMODE(s) #s,
-static const char *mousemodestrs[] = {
-       #include "editing_syms.h"
-};
+extern const char *mousemodestrs[];
 inline const char* enum2str(MouseMode m) {return mousemodestrs[m];}
 MouseMode str2mousemode(const std::string &);
 
@@ -95,11 +80,7 @@ enum ZoomFocus {
        #include "editing_syms.h"
 };
 
-#undef ZOOMFOCUS
-#define ZOOMFOCUS(s) #s,
-static const char *zoomfocusstrs[] = {
-       #include "editing_syms.h"
-};
+extern const char *zoomfocusstrs[];
 inline const char* enum2str(ZoomFocus m) {return zoomfocusstrs[m];}
 ZoomFocus str2zoomfocus(const std::string &);
 
@@ -113,17 +94,27 @@ enum DisplayControl {
        #include "editing_syms.h"
 };
 
-#undef DISPLAYCONTROL
-#define DISPLAYCONTROL(s) #s,
-static const char *displaycontrolstrs[] = {
-       #include "editing_syms.h"
-};
+extern const char *displaycontrolstrs[];
 inline const char* enum2str(DisplayControl m) {return displaycontrolstrs[m];}
 DisplayControl str2displaycontrol (const std::string &);
 
 #undef DISPLAYCONTROL
 #define DISPLAYCONTROL(a) /*empty*/
 
+// IMPORTMODE
+#undef IMPORTMODE
+#define IMPORTMODE(a) a,
+enum ImportMode {
+       #include "editing_syms.h"
+};
+
+extern const char *importmodestrs[];
+inline const char* enum2str(ImportMode m) {return importmodestrs[m];}
+ImportMode str2importmode (const std::string &);
+
+#undef IMPORTMODE
+#define IMPORTMODE(a) /*empty*/
+
 /////////////////////
 // These don't need their state saved. yet...
 enum CutCopyOp {