OSC: Changed gainVCA to gainfader as VCA is already used.

[ardour.git] / gtk2_ardour / editor_canvas_events.cc

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index e821254c9b5f78150430ca1880db6ba04d7f8f86..6eb017134da64b0ab06ba898572093867ee7474d 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -75,8 +75,11 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
        switch (direction) {
        case GDK_SCROLL_UP:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) {
-                       //for mouse-wheel zoom, force zoom-focus to mouse
-                       temporal_zoom_step_mouse_focus (false);
+                       if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) {
+                               temporal_zoom_step_mouse_focus (false);
+                       } else {
+                               temporal_zoom_step (false);
+                       }
                        return true;
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) {
                        scroll_left_step ();
@@ -101,8 +104,11 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 
        case GDK_SCROLL_DOWN:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) {
-                       //for mouse-wheel zoom, force zoom-focus to mouse
-                       temporal_zoom_step_mouse_focus (true);
+                       if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) {
+                               temporal_zoom_step_mouse_focus (true);
+                       } else {
+                               temporal_zoom_step (true);
+                       }
                        return true;
                } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) {
                        scroll_right_step ();
@@ -1024,9 +1030,8 @@ Editor::canvas_ruler_event (GdkEvent *event, ArdourCanvas::Item* item, ItemType
                case GDK_SCROLL_UP:
                        if (Keyboard::modifier_state_equals(event->scroll.state,
                                                            Keyboard::ScrollHorizontalModifier)) {
-                               scroll_left_half_page ();
-                       } else if (Profile->get_mixbus()) {
-                               //for mouse-wheel zoom, force zoom-focus to mouse
+                               scroll_left_step ();
+                       } else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) {
                                temporal_zoom_step_mouse_focus (false);
                        } else {
                                temporal_zoom_step (false);
@@ -1037,9 +1042,8 @@ Editor::canvas_ruler_event (GdkEvent *event, ArdourCanvas::Item* item, ItemType
                case GDK_SCROLL_DOWN:
                        if (Keyboard::modifier_state_equals(event->scroll.state,
                                                            Keyboard::ScrollHorizontalModifier)) {
-                               scroll_right_half_page ();
-                       } else if (Profile->get_mixbus()) {
-                               //for mouse-wheel zoom, force zoom-focus to mouse
+                               scroll_right_step ();
+                       } else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) {
                                temporal_zoom_step_mouse_focus (true);
                        } else {
                                temporal_zoom_step (true);
@@ -1215,7 +1219,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> 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() || UIConfiguration::instance().get_only_copy_imported_files()) {
+                       if (UIConfiguration::instance().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) {