Mix group tabs in the mixer.

[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 1f22a5b7971d79ccab42b3b521d1ad91df999cfd..86f7312d1755d40ed3fa55967f5b3007a1016cf5 100644 (file)
--- a/gtk2_ardour/canvas-note-event.h
+++ b/gtk2_ardour/canvas-note-event.h
@@ -49,7 +49,7 @@ namespace Canvas {
  *
  * A newer, better canvas should remove the need for all the ugly here.
  */
-class CanvasNoteEvent : public sigc::trackable, public InteractiveItem {
+class CanvasNoteEvent : virtual public sigc::trackable, public InteractiveItem {
 public:
        typedef Evoral::Note<double> NoteType;
        CanvasNoteEvent(
@@ -59,6 +59,8 @@ public:
 
        virtual ~CanvasNoteEvent();
 
+       virtual void show() = 0;
+       virtual void hide() = 0;
        virtual bool on_event(GdkEvent* ev);
 
        bool selected() const { return _selected; }
@@ -71,10 +73,10 @@ public:
        void show_velocity();
        void hide_velocity();
        
-       /**
-        * This slot is called, when a new channel is selected for the single event
-        * */
+       /** Channel changed for this specific event */
        void on_channel_change(uint8_t channel);
+
+       /** Channel selection changed */
        void on_channel_selection_change(uint16_t selection);
        
        void show_channel_selector();
@@ -90,8 +92,7 @@ public:
 
        const boost::shared_ptr<NoteType> note() const { return _note; }
        
-       inline static uint32_t meter_style_fill_color(uint8_t vel)
-       {
+       inline static uint32_t meter_style_fill_color(uint8_t vel) {
                if (vel < 64) {
                        return UINT_INTERPOLATE(
                                        ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorBase.get(),
@@ -106,12 +107,11 @@ public:
        }
        
        /// calculate outline colors from fill colors of notes
-       inline static uint32_t calculate_outline(uint32_t color) 
-       {
+       inline static uint32_t calculate_outline(uint32_t color) {
                return UINT_INTERPOLATE(color, 0x000000ff, 0.5);
        }
        
-       /// dividing the hue circle in 16 parts, hand adjusted for equal look, courtesy Thorsten Wilms
+       /// hue circle divided into 16 equal-looking parts, courtesy Thorsten Wilms
        static const uint32_t midi_channel_colors[16];
 
 protected: