Small cleanup.

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

diff --git a/gtk2_ardour/canvas-note.h b/gtk2_ardour/canvas-note.h
index 84791c89ca4d39499c47dec81c651704417624b1..49a37c17c9a4e6cc988eb5109fe0c3534f4bf41f 100644 (file)
--- a/gtk2_ardour/canvas-note.h
+++ b/gtk2_ardour/canvas-note.h
@@ -29,43 +29,43 @@
 namespace Gnome {
 namespace Canvas {
 
-class CanvasNote : public SimpleRect, public CanvasNoteEvent {
-public:
+class CanvasNote : public SimpleRect, public CanvasNoteEvent 
+{
+ public:
+       typedef Evoral::Note<Evoral::MusicalTime> NoteType;
+
+       CanvasNote (MidiRegionView&                   region,
+                   Group&                            group,
+                   const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>(),
+                    bool with_events = true);
+
        double x1() { return property_x1(); }
        double y1() { return property_y1(); }
        double x2() { return property_x2(); }
        double y2() { return property_y2(); }
 
-       void set_outline_color(uint32_t c) { property_outline_color_rgba() = c; }
-       void set_fill_color(uint32_t c) { property_fill_color_rgba() = c; }
-
-       bool on_event(GdkEvent* ev);
-
-       enum NoteEnd {
-               NOTE_ON,
-               NOTE_OFF
-       };
+       void set_outline_color(uint32_t c) { property_outline_color_rgba() = c; hide(); show(); }
+       void set_fill_color(uint32_t c)    { property_fill_color_rgba()    = c; hide(); show(); }
 
-       enum NoteState {
-               None,
-               RelativeResize,
-               AbsoluteResize
-       };
+       void show() { SimpleRect::show(); }
+       void hide() { SimpleRect::hide(); }
 
-       CanvasNote(
-                       MidiRegionView&                       region,
-                       Group&                                group,
-                       const boost::shared_ptr<ARDOUR::Note> note = boost::shared_ptr<ARDOUR::Note>())
+       bool on_event(GdkEvent* ev);
+       void move_event(double dx, double dy);
+};
 
-               : SimpleRect(group), CanvasNoteEvent(region, this, note), _note_state(None)
-       {
+class NoEventCanvasNote : public CanvasNote
+{
+  public:
+       NoEventCanvasNote (MidiRegionView& region,
+                           Group& group,
+                           const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>())
+               : CanvasNote (region, group, note, false) {}
+        
+       double point_vfunc(double, double, int, int, GnomeCanvasItem**) {
+               /* return a huge value to tell the canvas that we're never the item for an event */
+               return 9999999999999.0;
        }
-
-protected:
-       NoteState _note_state;
-
-private:
-
 };
 
 } // namespace Gnome