X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-note.h;h=46b0f1d600bb34f1d5c2497cdcd509bd0af4e32a;hb=3e59452fa0182ace7785c62acef83cb0d213cc86;hp=6147941ad2803b0cbaf214a8d9e38aa84684994b;hpb=f7bff95fbce75cb0d4c717b1400677edd814f7be;p=ardour.git

diff --git a/gtk2_ardour/canvas-note.h b/gtk2_ardour/canvas-note.h
index 6147941ad2..46b0f1d600 100644
--- a/gtk2_ardour/canvas-note.h
+++ b/gtk2_ardour/canvas-note.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2007 Paul Davis
-    Author: Dave Robillard
+    Author: David Robillard
     Author: Hans Baier
 
     This program is free software; you can redistribute it and/or modify
@@ -29,14 +29,20 @@
 namespace Gnome {
 namespace Canvas {
 
-class CanvasNote : public SimpleRect, public CanvasNoteEvent {
-public:
+class CanvasNote : public SimpleRect, public CanvasNoteEvent
+{
+ public:
 	typedef Evoral::Note<Evoral::MusicalTime> NoteType;
 
-	double x1() { return property_x1(); }
-	double y1() { return property_y1(); }
-	double x2() { return property_x2(); }
-	double y2() { return property_y2(); }
+	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(); }
@@ -46,24 +52,15 @@ public:
 
 	bool on_event(GdkEvent* ev);
 	void move_event(double dx, double dy);
-
-	CanvasNote (MidiRegionView&                   region,
-		    Group&                            group,
-		    const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>())
-		: SimpleRect(group), CanvasNoteEvent(region, this, note)
-	{
-	}
 };
 
 class NoEventCanvasNote : public CanvasNote
 {
-public:
-	NoEventCanvasNote (
-		MidiRegionView& region,
-		Group& group,
-		const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>()
-		)
-		: CanvasNote (region, group, note) {}
+  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 */