X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fnote_base.h;h=574ca54e6d75e37436fab7fbff4e3f461496778b;hb=69777d600fe2e1e034d24551ac9faec2c2481584;hp=8ee3a4d27790496a15f16ddfd5772b1fd19d47ad;hpb=045ef69ac37550cf376d40443555a57a931fe7b0;p=ardour.git

diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index 8ee3a4d277..574ca54e6d 100644
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -21,11 +21,12 @@
 #define __gtk_ardour_note_base_h__
 
 #include <boost/shared_ptr.hpp>
+
+#include "temporal/beats.h"
 #include "canvas/types.h"
-#include "ardour/midi_model.h"
+#include "gtkmm2ext/colors.h"
 
 #include "rgb_macros.h"
-#include "ardour_ui.h"
 #include "ui_config.h"
 
 class Editor;
@@ -33,6 +34,7 @@ class MidiRegionView;
 
 namespace Evoral {
 	template<typename T> class Note;
+	class Beats;
 }
 
 namespace ArdourCanvas {
@@ -40,33 +42,26 @@ namespace ArdourCanvas {
 	class Text;
 }
 
-/** This manages all the event handling for any MIDI event on the canvas.
+/** Base class for canvas notes (sustained note rectangles and hit diamonds).
  *
- * This is not actually a canvas item itself to avoid the dreaded diamond,
- * since various types of canvas items (Note (rect), Hit (diamond), etc)
- * need to share this functionality but can't share an ancestor.
+ * 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.
  *
  * Note: Because of this, derived classes need to manually bounce events to
  * on_event, it won't happen automatically.
- *
- * A newer, better canvas should remove the need for all the ugly here.
  */
 class NoteBase : public sigc::trackable
 {
 public:
-	typedef Evoral::Note<ARDOUR::MidiModel::TimeType> NoteType;
-
-	NoteBase (
-		MidiRegionView&                   region,
-		bool,
-		const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>()
-		);
+	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 *);
-
-        static PBD::Signal1<void, NoteBase*> NoteBaseDeleted;
+	ArdourCanvas::Item* item() const { return _item; }
 
 	virtual void show() = 0;
 	virtual void hide() = 0;
@@ -94,55 +89,37 @@ public:
 	virtual void set_outline_color(uint32_t c) = 0;
 	virtual void set_fill_color(uint32_t c) = 0;
 
+	virtual void set_ignore_events(bool ignore) = 0;
+
 	virtual ArdourCanvas::Coord x0 () const = 0;
 	virtual ArdourCanvas::Coord y0 () const = 0;
 	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 (selected) {
-                        if (vel < 64) {
-                                return UINT_INTERPOLATE(
-					ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorBase(),
-					ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorMid(),
-					(vel / (double)63.0));
-                        } else {
-                                return UINT_INTERPOLATE(
-					ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorMid(),
-					ARDOUR_UI::config()->get_canvasvar_SelectedMidiNoteColorTop(),
-					((vel-64) / (double)63.0));
-                        }
-                } else {
-                        if (vel < 64) {
-                                return UINT_INTERPOLATE(
-					ARDOUR_UI::config()->get_canvasvar_MidiNoteColorBase(),
-					ARDOUR_UI::config()->get_canvasvar_MidiNoteColorMid(),
-					(vel / (double)63.0));
-                        } else {
-                                return UINT_INTERPOLATE(
-					ARDOUR_UI::config()->get_canvasvar_MidiNoteColorMid(),
-					ARDOUR_UI::config()->get_canvasvar_MidiNoteColorTop(),
-					((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) {
-		return UINT_INTERPOLATE(color, 0x000000ff, 0.5);
+	inline static uint32_t calculate_outline(uint32_t color, bool selected=false) {
+		if (selected) {
+			return _selected_col;
+		} else {
+			return UINT_INTERPOLATE(color, 0x000000ff, 0.5);
+		}
 	}
 
 	/// hue circle divided into 16 equal-looking parts, courtesy Thorsten Wilms
 	static const uint32_t midi_channel_colors[16];
 
-        bool mouse_near_ends () const;
-        bool big_enough_to_trim () const;
+	bool mouse_near_ends () const;
+	virtual bool big_enough_to_trim () const;
 
 protected:
 	enum State { None, Pressed, Dragging };
@@ -156,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__ */