X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-note.h;h=46b0f1d600bb34f1d5c2497cdcd509bd0af4e32a;hb=cd0d68a591ee64bb0e85d9a364af9fe6abdeecbe;hp=f49157e0cfa418e1cda6fef5e6eeb9d55d7abce8;hpb=4d1542d1e59737fb3f6464ebb5638ca64cb985e8;p=ardour.git

diff --git a/gtk2_ardour/canvas-note.h b/gtk2_ardour/canvas-note.h
index f49157e0cf..46b0f1d600 100644
--- a/gtk2_ardour/canvas-note.h
+++ b/gtk2_ardour/canvas-note.h
@@ -1,6 +1,7 @@
 /*
-    Copyright (C) 2007 Paul Davis 
-    Author: Dave Robillard
+    Copyright (C) 2007 Paul Davis
+    Author: David 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,49 @@
 
 #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 {
-public:
-	CanvasNote(MidiRegionView& region, Group& group, const ARDOUR::MidiModel::Note* note=NULL)
-		: SimpleRect(group), CanvasMidiEvent(region, this, note)
-	{
-	}
-	
-	virtual void selected(bool yn) {
-		// Temporary hack, no reversal for now
-		if (yn)
-			property_outline_color_rgba() = 0xFF000099;
+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() const { return property_x1(); }
+	double y1() const { return property_y1(); }
+	double x2() const { return property_x2(); }
+	double y2() const { 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);
+	void move_event(double dx, double dy);
+};
+
+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;
 	}
-	
-	bool on_event(GdkEvent* ev) { return CanvasMidiEvent::on_event(ev); }
 };
 
 } // namespace Gnome