Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / note_base.cc

diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc
index 71d8dd98fcfe964a3cc2da3dad2f87c31268c773..9fba9be10aaf9f9d1eb858f76ac86a0d7b7128b2 100644 (file)
--- a/gtk2_ardour/note_base.cc
+++ b/gtk2_ardour/note_base.cc
@@ -254,7 +254,8 @@ NoteBase::set_mouse_fractions (GdkEvent* ev)
 bool
 NoteBase::event_handler (GdkEvent* ev)
 {
-       if (!_region.get_time_axis_view().editor().internal_editing()) {
+       PublicEditor& editor = _region.get_time_axis_view().editor();
+       if (!editor.internal_editing()) {
                return false;
        }
 
@@ -276,7 +277,7 @@ NoteBase::event_handler (GdkEvent* ev)
        case GDK_BUTTON_PRESS:
                set_mouse_fractions (ev);
                if (ev->button.button == 3 && Keyboard::no_modifiers_active (ev->button.state) && _selected) {
-                       _region.get_time_axis_view().editor().edit_notes (_region);
+                       editor.edit_notes (_region);
                        return true;
                }
                break;
@@ -292,7 +293,7 @@ NoteBase::event_handler (GdkEvent* ev)
                break;
        }
 
-       return _region.get_time_axis_view().editor().canvas_note_event (ev, _item);
+       return editor.canvas_note_event (ev, _item);
 }
 
 bool