Update region_ops.txt to match current behaviour, and fix a couple of comments.

[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 72772a2fc0186c35f57d91feb3c75a3345bc725f..e5b4896b92313ecb25883a35f02a14f33cbf0764 100644 (file)
--- a/gtk2_ardour/canvas-note-event.h
+++ b/gtk2_ardour/canvas-note-event.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2007 Paul Davis
-    Author: Dave Robillard
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -74,7 +74,7 @@ class CanvasNoteEvent : virtual public sigc::trackable
        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;
 
@@ -95,26 +95,43 @@ class CanvasNoteEvent : virtual public sigc::trackable
        virtual void set_outline_color(uint32_t c) = 0;
        virtual void set_fill_color(uint32_t c) = 0;
 
-       virtual double x1() = 0;
-       virtual double y1() = 0;
-       virtual double x2() = 0;
-       virtual double y2() = 0;
+       virtual double x1() const = 0;
+       virtual double y1() const = 0;
+       virtual double x2() const = 0;
+       virtual double y2() const = 0;
+
+        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) {
-               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_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_MidiNoteMeterColorMid.get(),
-                                       ARDOUR_UI::config()->canvasvar_MidiNoteMeterColorTop.get(),
+                        } 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
@@ -125,7 +142,10 @@ class CanvasNoteEvent : virtual public sigc::trackable
        /// hue circle divided into 16 equal-looking parts, courtesy Thorsten Wilms
        static const uint32_t midi_channel_colors[16];
 
-protected:
+        bool mouse_near_ends () const;
+        bool big_enough_to_trim () const;
+
+  protected:
        enum State { None, Pressed, Dragging };
 
        MidiRegionView&                   _region;
@@ -134,9 +154,13 @@ protected:
        Widget*                           _channel_selector_widget;
        State                             _state;
        const boost::shared_ptr<NoteType> _note;
-       bool                              _own_note;
        bool                              _selected;
        bool                              _valid;
+        float                             _mouse_x_fraction;
+        float                             _mouse_y_fraction;
+       uint16_t                          _channel_selection;
+
+        void set_mouse_fractions (GdkEvent*);
 };
 
 } // namespace Gnome