Chris's work on the region list

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

diff --git a/gtk2_ardour/canvas-note.cc b/gtk2_ardour/canvas-note.cc
index b39deb0fed2a0acec9d9bc11ba916ca38036c9ba..973ab4db6dfef12e5c8f8808701c5f6707e8c2ad 100644 (file)
--- a/gtk2_ardour/canvas-note.cc
+++ b/gtk2_ardour/canvas-note.cc
@@ -1,7 +1,7 @@
 #include "canvas-note.h"
 #include "midi_region_view.h"
 #include "public_editor.h"
-#include "ardour/note.h"
+#include "evoral/Note.hpp"
 
 using namespace ARDOUR;
 
@@ -15,9 +15,9 @@ CanvasNote::on_event(GdkEvent* ev)
        static double   middle_point, last_x;
        Gdk::Cursor     cursor;
        static NoteEnd  note_end;
-       Editing::MidiEditMode edit_mode = _region.get_trackview().editor.current_midi_edit_mode();
+       Editing::MidiEditMode edit_mode = _region.get_trackview().editor().current_midi_edit_mode();
 
-       switch(ev->type) {
+       switch (ev->type) {
        case GDK_BUTTON_PRESS:
                if (ev->button.button == 2 ||
                                (ev->button.button == 1 &&
@@ -26,7 +26,7 @@ CanvasNote::on_event(GdkEvent* ev)
                        event_x = ev->button.x;
                        middle_point = region_start + x1() + (x2() - x1()) / 2.0L;
 
-                       if(event_x <= middle_point) {
+                       if (event_x <= middle_point) {
                                cursor = Gdk::Cursor(Gdk::LEFT_SIDE);
                                note_end = NOTE_ON;
                        } else {
@@ -47,8 +47,8 @@ CanvasNote::on_event(GdkEvent* ev)
                        last_x = event_x;
 
                        return true;
-               }
-
+               } 
+               
        case GDK_MOTION_NOTIFY:
                event_x = ev->motion.x;
 
@@ -80,11 +80,11 @@ CanvasNote::on_event(GdkEvent* ev)
                        return true;
 
                default:
-                       return CanvasMidiEvent::on_event(ev);
+                       return CanvasNoteEvent::on_event(ev);
                }
 
        default:
-               return CanvasMidiEvent::on_event(ev);
+               return CanvasNoteEvent::on_event(ev);
        }
 }