Various tweaks to the port matrix: open to full size; remove buttons and move their...

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

diff --git a/gtk2_ardour/canvas-hit.h b/gtk2_ardour/canvas-hit.h
index e9be381ef278dc34406aa5401febcc72900f5357..a467952966ad793199dbc196bf4932ab785aec33 100644 (file)
--- a/gtk2_ardour/canvas-hit.h
+++ b/gtk2_ardour/canvas-hit.h
@@ -27,18 +27,23 @@
 namespace Gnome {
 namespace Canvas {
 
-class CanvasHit : public Diamond, public CanvasMidiEvent {
+class CanvasHit : public Diamond, public CanvasNoteEvent {
 public:
+       typedef Evoral::Note<double> NoteType;
+
        CanvasHit(
-                       MidiRegionView&                       region,
-                       Group&                                group,
-                       double                                size,
-                       const boost::shared_ptr<ARDOUR::Note> note = boost::shared_ptr<ARDOUR::Note>())
+                       MidiRegionView&                   region,
+                       Group&                            group,
+                       double                            size,
+                       const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>())
 
-               : Diamond(group, size), CanvasMidiEvent(region, this, note)
+               : Diamond(group, size), CanvasNoteEvent(region, this, note)
        {
        }
        
+       void show() { Diamond::show(); }
+       void hide() { Diamond::hide(); }
+
        double x1() { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return x1; }
        double y1() { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return y1; }
        double x2() { double x1, y1, x2, y2; get_bounds(x1,y1,x2,y2); return x2; }
@@ -47,7 +52,7 @@ public:
        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) { return CanvasMidiEvent::on_event(ev); }
+       bool on_event(GdkEvent* ev) { return CanvasNoteEvent::on_event(ev); }
 };
 
 } // namespace Gnome