(hopefully) fix smart-mode breakage of xfade operations
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 30 Jun 2014 23:18:27 +0000 (19:18 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 30 Jun 2014 23:18:34 +0000 (19:18 -0400)
We needed to set the selected regionview from a click when clicking on xfade items, but I also removed duplicate logic for some similar items

gtk2_ardour/editor_mouse.cc

index 760c92f55e91f209fe1b920305996f2790e2960e..634e383fa961c3cd6e6f8a869d6290ec954c1dd0 100644 (file)
@@ -565,13 +565,6 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
        case RegionViewName:
        case LeftFrameHandle:
        case RightFrameHandle:
-               if (eff_mouse_mode != MouseRange) {
-                       set_selected_regionview_from_click (press, op);
-               } else if (event->type == GDK_BUTTON_PRESS) {
-                       set_selected_track_as_side_effect (op);
-               }
-               break;
-
        case FadeInHandleItem:
        case FadeInTrimHandleItem:
        case FadeInItem:
@@ -580,7 +573,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
        case FadeOutItem:
        case StartCrossFadeItem:
        case EndCrossFadeItem:
-               if (eff_mouse_mode != MouseRange) {
+               if (get_smart_mode() || eff_mouse_mode != MouseRange) {
                        set_selected_regionview_from_click (press, op);
                } else if (event->type == GDK_BUTTON_PRESS) {
                        set_selected_track_as_side_effect (op);