* implemented three coloring modes for MIDI tracks (untested yet)

git-svn-id: svn://localhost/ardour2/branches/3.0@4344 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 3 insertions, 6 deletions

diff --git a/gtk2_ardour/canvas-note-event.h b/gtk2_ardour/canvas-note-event.h
index efb717823c..748c50efd4 100644
--- a/gtk2_ardour/canvas-note-event.h
+++ b/gtk2_ardour/canvas-note-event.h
@@ -65,6 +65,8 @@ public:
 
 	void move_event(double dx, double dy);
 	
+	uint32_t base_color();
+	
 	void show_velocity();
 	void hide_velocity();
 	
@@ -101,11 +103,6 @@ public:
 					((vel-64) / (double)63.0));
 		}
 	}
-
-	inline static uint32_t meter_style_outline_color(uint8_t vel)
-	{
-		return calculate_outline(meter_style_fill_color(vel));
-	}
 	
 	/// calculate outline colors from fill colors of notes
 	inline static uint32_t calculate_outline(uint32_t color) 
@@ -121,7 +118,7 @@ protected:
 
 	MidiRegionView&                       _region;
 	Item* const                           _item;
-	Text*                                 _text;
+	InteractiveText*                      _text;
 	Widget*                               _channel_selector_widget;
 	State                                 _state;
 	const boost::shared_ptr<Evoral::Note> _note;