X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fnote_base.h;h=574ca54e6d75e37436fab7fbff4e3f461496778b;hb=6c19a776f43b4a9869780e3312764d039a16cd39;hp=f72f71181b7f71bcad27a91dc786fd80ca50af57;hpb=0b8f57f762d5e963b6ff41a388b1168615136817;p=ardour.git

diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index f72f71181b..574ca54e6d 100644
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -24,6 +24,7 @@
 
 #include "temporal/beats.h"
 #include "canvas/types.h"
+#include "gtkmm2ext/colors.h"
 
 #include "rgb_macros.h"
 #include "ui_config.h"
@@ -103,12 +104,12 @@ public:
 
 	static void set_colors ();
 
-	static uint32_t meter_style_fill_color(uint8_t vel, bool selected);
+	static Gtkmm2ext::Color meter_style_fill_color(uint8_t vel, bool selected);
 
 	/// calculate outline colors from fill colors of notes
 	inline static uint32_t calculate_outline(uint32_t color, bool selected=false) {
 		if (selected) {
-			return _selected_outline_col;
+			return _selected_col;
 		} else {
 			return UINT_INTERPOLATE(color, 0x000000ff, 0.5);
 		}
@@ -140,9 +141,9 @@ protected:
 private:
 	bool event_handler (GdkEvent *);
 
-	static uint32_t _selected_mod_col;
-	static uint32_t _selected_outline_col;
-	static uint32_t _selected_col;
+	static Gtkmm2ext::Color _selected_col;
+	static Gtkmm2ext::SVAModifier color_modifier;
+	static Gtkmm2ext::Color velocity_color_table[128];
 	static bool _color_init;
 };