X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas_events.cc;h=93c0abea356bf2be94e2ae58f9525151e8b067f9;hb=c2eea34fb0b419405e24d67f77ce3464ac95c0a6;hp=999f2082009256f8e22ef7d303baba074d259dec;hpb=31b033f0d20c3f126f6d354770b15fcf152860e9;p=ardour.git diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 999f208200..93c0abea35 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -35,6 +35,7 @@ #include "editor.h" #include "keyboard.h" #include "public_editor.h" +#include "ardour_ui.h" #include "audio_region_view.h" #include "audio_streamview.h" #include "audio_time_axis.h" @@ -1085,12 +1086,6 @@ Editor::canvas_playhead_cursor_event (GdkEvent *event, ArdourCanvas::Item* item) return typed_event (item, event, PlayheadCursorItem); } -bool -Editor::canvas_zoom_rect_event (GdkEvent *event, ArdourCanvas::Item* item) -{ - return typed_event (item, event, NoItem); -} - bool Editor::canvas_note_event (GdkEvent *event, ArdourCanvas::Item* item) { @@ -1207,7 +1202,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr const& context, * TODO: check if file is audio/midi, allow drops on same track-type only, * currently: if audio is dropped on a midi-track, it is only added to the region-list */ - if (Profile->get_sae() || Config->get_only_copy_imported_files()) { + if (Profile->get_sae() || ARDOUR_UI::config()->get_only_copy_imported_files()) { context->drag_status(Gdk::ACTION_COPY, time); } else { if ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY) {