diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-11 21:30:36 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-11 21:30:36 +0000 |
| commit | a98fa4bc61e26cd94aeb6720325633c4e6618155 (patch) | |
| tree | 21e55518ce42e5ffe3e974b32e10192525627b82 /gtk2_ardour/editor_mouse.cc | |
| parent | 4d780bdcd0009943ec292dfd2177e60804d91245 (diff) | |
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate
git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_mouse.cc')
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 1724666976..d7d1c34280 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -640,15 +640,12 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp } break; - - case StartCrossFadeItem: - case EndCrossFadeItem: - break; - case FadeInHandleItem: case FadeInItem: case FadeOutHandleItem: case FadeOutItem: + case StartCrossFadeItem: + case EndCrossFadeItem: if (doing_object_stuff() || (mouse_mode != MouseRange && mouse_mode != MouseObject)) { set_selected_regionview_from_click (press, op); } else if (event->type == GDK_BUTTON_PRESS) { @@ -1484,11 +1481,11 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case StartCrossFadeItem: - popup_xfade_context_menu (1, event->button.time, item, item_type); + popup_xfade_in_context_menu (1, event->button.time, item, item_type); break; case EndCrossFadeItem: - popup_xfade_context_menu (1, event->button.time, item, item_type); + popup_xfade_out_context_menu (1, event->button.time, item, item_type); break; case StreamItem: |