X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fnote_base.h;h=b7be36ada864b756b9f74eede7931c9bad715234;hb=b115a04babe8435eeaba36469eeb6145250c70cd;hp=e63e59b84b2326c04b7e299f297606b103a0b2c1;hpb=4dc63966f0872efe768dad61eb9b8785d06b92d1;p=ardour.git

diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index e63e59b84b..b7be36ada8 100644
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -23,7 +23,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include "canvas/types.h"
-#include "evoral/types.hpp"
 
 #include "rgb_macros.h"
 #include "ui_config.h"
@@ -33,6 +32,7 @@ class MidiRegionView;
 
 namespace Evoral {
 	template<typename T> class Note;
+	class Beats;
 }
 
 namespace ArdourCanvas {
@@ -52,16 +52,14 @@ namespace ArdourCanvas {
  */
 class NoteBase : public sigc::trackable
 {
-  public:
+public:
 	typedef Evoral::Note<Evoral::Beats> NoteType;
 
 	NoteBase (MidiRegionView& region, bool, const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>());
 	virtual ~NoteBase ();
 
 	void set_item (ArdourCanvas::Item *);
-        ArdourCanvas::Item* item() const { return _item; }
-
-        static PBD::Signal1<void, NoteBase*> NoteBaseDeleted;
+	ArdourCanvas::Item* item() const { return _item; }
 
 	virtual void show() = 0;
 	virtual void hide() = 0;
@@ -96,32 +94,28 @@ class NoteBase : public sigc::trackable
 	virtual ArdourCanvas::Coord x1 () const = 0;
 	virtual ArdourCanvas::Coord y1 () const = 0;
 
-        float mouse_x_fraction() const { return _mouse_x_fraction; }
-        float mouse_y_fraction() const { return _mouse_y_fraction; }
+	float mouse_x_fraction() const { return _mouse_x_fraction; }
+	float mouse_y_fraction() const { return _mouse_y_fraction; }
 
 	const boost::shared_ptr<NoteType> note() const { return _note; }
 	MidiRegionView& region_view() const { return _region; }
 
+	static void set_colors ();
+
 	inline static uint32_t meter_style_fill_color(uint8_t vel, bool selected) {
 		if (selected) {
-			return UIConfiguration::instance().color_mod ("midi note selected", "midi note");
+			return _selected_mod_col;
 		} else if (vel < 64) {
-			return UINT_INTERPOLATE(
-				UIConfiguration::instance().color_mod ("midi note min", "midi note"),
-				UIConfiguration::instance().color_mod ("midi note mid", "midi note"),
-				(vel / (double)63.0));
+			return UINT_INTERPOLATE(_min_col, _mid_col, (vel / (double)63.0));
 		} else {
-			return UINT_INTERPOLATE(
-				UIConfiguration::instance().color_mod ("midi note mid", "midi note"),
-				UIConfiguration::instance().color_mod ("midi note max", "midi note"),
-				((vel-64) / (double)63.0));
+			return UINT_INTERPOLATE(_mid_col, _max_col, ((vel - 64) / (double)63.0));
 		}
 	}
 
 	/// calculate outline colors from fill colors of notes
 	inline static uint32_t calculate_outline(uint32_t color, bool selected=false) {
 		if (selected) {
-			return UIConfiguration::instance().color ("midi note selected outline");
+			return _selected_outline_col;
 		} else {
 			return UINT_INTERPOLATE(color, 0x000000ff, 0.5);
 		}
@@ -130,8 +124,8 @@ class NoteBase : public sigc::trackable
 	/// hue circle divided into 16 equal-looking parts, courtesy Thorsten Wilms
 	static const uint32_t midi_channel_colors[16];
 
-        bool mouse_near_ends () const;
-        virtual bool big_enough_to_trim () const;
+	bool mouse_near_ends () const;
+	virtual bool big_enough_to_trim () const;
 
 protected:
 	enum State { None, Pressed, Dragging };
@@ -145,13 +139,21 @@ protected:
 	bool                              _own_note;
 	bool                              _selected;
 	bool                              _valid;
-        float                             _mouse_x_fraction;
-        float                             _mouse_y_fraction;
+	float                             _mouse_x_fraction;
+	float                             _mouse_y_fraction;
 
-        void set_mouse_fractions (GdkEvent*);
+	void set_mouse_fractions (GdkEvent*);
 
 private:
 	bool event_handler (GdkEvent *);
+
+	static uint32_t _selected_mod_col;
+	static uint32_t _selected_outline_col;
+	static uint32_t _selected_col;
+	static uint32_t _min_col;
+	static uint32_t _mid_col;
+	static uint32_t _max_col;
+	static bool _color_init;
 };
 
 #endif /* __gtk_ardour_note_h__ */