Fix genererally retarded and broken note range / diskstream display / etc. related...

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

diff --git a/gtk2_ardour/canvas-note.h b/gtk2_ardour/canvas-note.h
index f49157e0cfa418e1cda6fef5e6eeb9d55d7abce8..46f4bbee35982de1c0728945810fcfcedd0eb685 100644 (file)
--- a/gtk2_ardour/canvas-note.h
+++ b/gtk2_ardour/canvas-note.h
@@ -1,6 +1,7 @@
 /*
-    Copyright (C) 2007 Paul Davis 
+    Copyright (C) 2007 Paul Davis
     Author: Dave Robillard
+    Author: Hans Baier
 
     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
@@ -22,25 +23,50 @@
 
 #include <iostream>
 #include "simplerect.h"
-#include "canvas-midi-event.h"
+#include "canvas-note-event.h"
+#include "midi_util.h"
 
 namespace Gnome {
 namespace Canvas {
 
-class CanvasNote : public SimpleRect, public CanvasMidiEvent {
+class CanvasNote : public SimpleRect, public CanvasNoteEvent {
 public:
-       CanvasNote(MidiRegionView& region, Group& group, const ARDOUR::MidiModel::Note* note=NULL)
-               : SimpleRect(group), CanvasMidiEvent(region, this, note)
+       typedef Evoral::Note<double> NoteType;
+
+       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; hide(); show(); }
+       void set_fill_color(uint32_t c)    { property_fill_color_rgba()    = c; hide(); show(); }
+
+       void show() { SimpleRect::show(); }
+       void hide() { SimpleRect::hide(); }
+
+       bool on_event(GdkEvent* ev);
+
+       enum NoteEnd {
+               NOTE_ON,
+               NOTE_OFF
+       };
+
+       enum NoteState {
+               None,
+               RelativeResize,
+               AbsoluteResize
+       };
+
+       CanvasNote(
+                       MidiRegionView&                   region,
+                       Group&                            group,
+                       const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>())
+               : SimpleRect(group), CanvasNoteEvent(region, this, note), _note_state(None)
        {
        }
-       
-       virtual void selected(bool yn) {
-               // Temporary hack, no reversal for now
-               if (yn)
-                       property_outline_color_rgba() = 0xFF000099;
-       }
-       
-       bool on_event(GdkEvent* ev) { return CanvasMidiEvent::on_event(ev); }
+
+protected:
+       NoteState _note_state;
 };
 
 } // namespace Gnome