forward port of 7539 from 2.x

[ardour.git] / gtk2_ardour / canvas-note-event.h

diff --git a/gtk2_ardour/canvas-note-event.h b/gtk2_ardour/canvas-note-event.h
index af5dd24102159a213f7b6746964f9a325065b1dc..c1795c330e4a766870153030bf3eb48e5e20ea43 100644 (file)
--- a/gtk2_ardour/canvas-note-event.h
+++ b/gtk2_ardour/canvas-note-event.h
@@ -28,8 +28,8 @@
 
 #include "rgb_macros.h"
 #include "ardour_ui.h"
+#include "canvas-noevent-text.h"
 #include "ui_config.h"
-#include "interactive-item.h"
 
 class Editor;
 class MidiRegionView;
@@ -51,8 +51,9 @@ namespace Canvas {
  *
  * A newer, better canvas should remove the need for all the ugly here.
  */
-class CanvasNoteEvent : virtual public sigc::trackable, public InteractiveItem {
-public:
+class CanvasNoteEvent : virtual public sigc::trackable
+{
+  public:
        typedef Evoral::Note<ARDOUR::MidiModel::TimeType> NoteType;
 
        CanvasNoteEvent(
@@ -73,7 +74,7 @@ public:
        void validate ();
 
        bool selected() const { return _selected; }
-       void selected(bool yn);
+       void set_selected(bool yn);
 
        virtual void move_event(double dx, double dy) = 0;
 
@@ -102,18 +103,32 @@ public:
        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) {
-               if (vel < 64) {
-                       return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorBase.get(),
-                                       ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorMid.get(),
+       inline static uint32_t meter_style_fill_color(uint8_t vel, bool selected) {
+                if (selected) {
+                        if (vel < 64) {
+                                return UINT_INTERPOLATE(
+                                       ARDOUR_UI::config()->canvasvar_SelectedMidiNoteColorBase.get(),
+                                       ARDOUR_UI::config()->canvasvar_SelectedMidiNoteColorMid.get(),
                                        (vel / (double)63.0));
-               } else {
-                       return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorMid.get(),
-                                       ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorTop.get(),
+                        } else {
+                                return UINT_INTERPOLATE(
+                                       ARDOUR_UI::config()->canvasvar_SelectedMidiNoteColorMid.get(),
+                                       ARDOUR_UI::config()->canvasvar_SelectedMidiNoteColorTop.get(),
                                        ((vel-64) / (double)63.0));
-               }
+                        }
+                } else {
+                        if (vel < 64) {
+                                return UINT_INTERPOLATE(
+                                       ARDOUR_UI::config()->canvasvar_MidiNoteColorBase.get(),
+                                       ARDOUR_UI::config()->canvasvar_MidiNoteColorMid.get(),
+                                       (vel / (double)63.0));
+                        } else {
+                                return UINT_INTERPOLATE(
+                                       ARDOUR_UI::config()->canvasvar_MidiNoteColorMid.get(),
+                                       ARDOUR_UI::config()->canvasvar_MidiNoteColorTop.get(),
+                                       ((vel-64) / (double)63.0));
+                        }
+                }
        }
 
        /// calculate outline colors from fill colors of notes
@@ -129,7 +144,7 @@ protected:
 
        MidiRegionView&                   _region;
        Item* const                       _item;
-       InteractiveText*                  _text;
+       NoEventText*                      _text;
        Widget*                           _channel_selector_widget;
        State                             _state;
        const boost::shared_ptr<NoteType> _note;