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

diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index 9a135e4d9c..574ca54e6d 100644
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -22,11 +22,11 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include "temporal/beats.h"
 #include "canvas/types.h"
-#include "evoral/types.hpp"
+#include "gtkmm2ext/colors.h"
 
 #include "rgb_macros.h"
-#include "ardour_ui.h"
 #include "ui_config.h"
 
 class Editor;
@@ -34,6 +34,7 @@ class MidiRegionView;
 
 namespace Evoral {
 	template<typename T> class Note;
+	class Beats;
 }
 
 namespace ArdourCanvas {
@@ -46,23 +47,21 @@ namespace ArdourCanvas {
  * This is not actually a canvas item itself to avoid the dreaded diamond
  * inheritance pattern, since various types of canvas items (Note (rect), Hit
  * (diamond), etc) need to share this functionality but can't share an
- * ancestor. 
+ * ancestor.
  *
  * Note: Because of this, derived classes need to manually bounce events to
  * on_event, it won't happen automatically.
  */
 class NoteBase : public sigc::trackable
 {
-  public:
-	typedef Evoral::Note<Evoral::Beats> NoteType;
+public:
+	typedef Evoral::Note<Temporal::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;
@@ -97,30 +96,20 @@ 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; }
 
-	inline static uint32_t meter_style_fill_color(uint8_t vel, bool selected) {
-		if (vel < 64) {
-			return UINT_INTERPOLATE(
-				ARDOUR_UI::config()->color_mod ("midi note min", "midi note"),
-				ARDOUR_UI::config()->color_mod ("midi note mid", "midi note"),
-				(vel / (double)63.0));
-		} else {
-			return UINT_INTERPOLATE(
-				ARDOUR_UI::config()->color_mod ("midi note mid", "midi note"),
-				ARDOUR_UI::config()->color_mod ("midi note max", " midi note"),
-				((vel-64) / (double)63.0));
-		}
-	}
+	static void set_colors ();
+
+	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 ARDOUR_UI::config()->color ("midi note selected outline");
+			return _selected_col;
 		} else {
 			return UINT_INTERPOLATE(color, 0x000000ff, 0.5);
 		}
@@ -129,8 +118,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 };
@@ -144,13 +133,18 @@ protected:
 	bool                              _own_note;
 	bool                              _selected;
 	bool                              _valid;
-        float                             _mouse_x_fraction;
-        float                             _mouse_y_fraction;
-        
-        void set_mouse_fractions (GdkEvent*);
+	float                             _mouse_x_fraction;
+	float                             _mouse_y_fraction;
+
+	void set_mouse_fractions (GdkEvent*);
 
 private:
 	bool event_handler (GdkEvent *);
+
+	static Gtkmm2ext::Color _selected_col;
+	static Gtkmm2ext::SVAModifier color_modifier;
+	static Gtkmm2ext::Color velocity_color_table[128];
+	static bool _color_init;
 };
 
 #endif /* __gtk_ardour_note_h__ */