X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_mouse.cc;h=85ffaf2943929ece1502fa5ca4455e6f2f2f018c;hb=05451a80f2dd90d2d5ea9f1a529d0573ac24587c;hp=6bf5d92f998a11708673639bc12992f30f1be233;hpb=d4d5b30aebb8a54358bfb203c84cfd641bff79f3;p=ardour.git diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 6bf5d92f99..85ffaf2943 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -66,8 +66,6 @@ #include "ardour/profile.h" #include "ardour/route.h" #include "ardour/audio_track.h" -#include "ardour/audio_diskstream.h" -#include "ardour/midi_diskstream.h" #include "ardour/playlist.h" #include "ardour/audioplaylist.h" #include "ardour/audioregion.h" @@ -181,7 +179,7 @@ Editor::which_grabber_cursor () if (_internal_editing) { switch (mouse_mode) { - case MouseRange: + case MouseDraw: c = _cursors->midi_pencil; break; @@ -207,7 +205,7 @@ Editor::which_grabber_cursor () boost::shared_ptr m = _movable.lock(); if (m && m->locked()) { c = _cursors->speaker; - } + } break; } } @@ -243,7 +241,7 @@ Editor::set_canvas_cursor () if (_internal_editing) { switch (mouse_mode) { - case MouseRange: + case MouseDraw: current_canvas_cursor = _cursors->midi_pencil; break; @@ -270,6 +268,11 @@ Editor::set_canvas_cursor () current_canvas_cursor = which_grabber_cursor(); break; + case MouseDraw: + /* shouldn't be possible, but just cover it anyway ... */ + current_canvas_cursor = _cursors->midi_pencil; + break; + case MouseGain: current_canvas_cursor = _cursors->cross_hair; break; @@ -304,8 +307,11 @@ Editor::set_canvas_cursor () } /* up-down cursor as a cue that automation can be dragged up and down when in join object/range mode */ - if (join_object_range_button.get_active() && last_item_entered) { - if (last_item_entered->property_parent() && (*last_item_entered->property_parent()).get_data (X_("timeselection"))) { + if (join_object_range_button.get_active()) { + double x, y; + get_pointer_position (x, y); + ArdourCanvas::Item* i = track_canvas->get_item_at (x, y); + if (i && i->property_parent() && (*i->property_parent()).get_data (X_("timeselection"))) { pair tvp = trackview_by_y_position (_last_motion_y + vertical_adjustment.get_value() - canvas_timebars_vsize); if (dynamic_cast (tvp.first)) { current_canvas_cursor = _cursors->up_down; @@ -338,6 +344,10 @@ Editor::set_mouse_mode (MouseMode m, bool force) act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object")); break; + case MouseDraw: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-draw")); + break; + case MouseGain: act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-gain")); break; @@ -370,27 +380,83 @@ Editor::set_mouse_mode (MouseMode m, bool force) void Editor::mouse_mode_toggled (MouseMode m) { + Glib::RefPtr act; + Glib::RefPtr tact; + + switch (m) { + case MouseRange: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-range")); + break; + + case MouseObject: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object")); + break; + + case MouseDraw: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-draw")); + break; + + case MouseGain: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-gain")); + break; + + case MouseZoom: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-zoom")); + break; + + case MouseTimeFX: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-timefx")); + break; + + case MouseAudition: + act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-audition")); + break; + } + + assert (act); + + tact = Glib::RefPtr::cast_dynamic (act); + assert (tact); + + if (!tact->get_active()) { + /* this was just the notification that the old mode has been + * left. we'll get called again with the new mode active in a + * jiffy. + */ + return; + } + + switch (m) { + case MouseDraw: + act = ActionManager::get_action (X_("MouseMode"), X_("toggle-internal-edit")); + tact = Glib::RefPtr::cast_dynamic(act); + tact->set_active (true); + break; + default: + break; + } + mouse_mode = m; instant_save (); - + if (!internal_editing()) { if (mouse_mode != MouseRange && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) { - + /* in all modes except range and joined object/range, hide the range selection, show the object (region) selection. */ - + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { (*i)->hide_selection (); } - + } else { - + /* in range or object/range mode, show the range selection. */ - + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { (*i)->show_selection (selection->time); } @@ -419,10 +485,15 @@ Editor::step_mouse_mode (bool next) break; case MouseRange: - if (next) set_mouse_mode (MouseZoom); + if (next) set_mouse_mode (MouseDraw); else set_mouse_mode (MouseObject); break; + case MouseDraw: + if (next) set_mouse_mode (MouseZoom); + else set_mouse_mode (MouseRange); + break; + case MouseZoom: if (next) { if (Profile->get_sae()) { @@ -434,7 +505,7 @@ Editor::step_mouse_mode (bool next) if (Profile->get_sae()) { set_mouse_mode (MouseObject); } else { - set_mouse_mode (MouseRange); + set_mouse_mode (MouseDraw); } } break; @@ -463,6 +534,22 @@ Editor::step_mouse_mode (bool next) } } +bool +Editor::toggle_internal_editing_from_double_click (GdkEvent* event) +{ + if (_drags->active()) { + _drags->end_grab (event); + } + + ActionManager::do_action ("MouseMode", "toggle-internal-edit"); + + /* prevent reversion of edit cursor on button release */ + + pre_press_cursor = 0; + + return true; +} + void Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemType item_type) { @@ -484,7 +571,8 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp (mouse_mode != MouseAudition || item_type != RegionItem) && (mouse_mode != MouseTimeFX || item_type != RegionItem) && (mouse_mode != MouseGain) && - (mouse_mode != MouseRange)) || + (mouse_mode != MouseRange) && + (mouse_mode != MouseDraw)) || ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3) || internal_editing()) { @@ -510,7 +598,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp case RegionItem: if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) { set_selected_regionview_from_click (press, op, true); - } else if (event->type == GDK_BUTTON_PRESS) { + } else if (press) { selection->clear_tracks (); set_selected_track_as_side_effect (op, true); } @@ -589,26 +677,42 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT return true; case TempoMarkerItem: - _drags->set ( - new TempoMarkerDrag ( - this, - item, - Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier) - ), - event - ); - return true; + { + TempoMarker* m = reinterpret_cast (item->get_data ("marker")); + assert (m); + if (m->tempo().movable ()) { + _drags->set ( + new TempoMarkerDrag ( + this, + item, + Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier) + ), + event + ); + return true; + } else { + return false; + } + } case MeterMarkerItem: - _drags->set ( - new MeterMarkerDrag ( - this, - item, - Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier) - ), - event - ); - return true; + { + MeterMarker* m = reinterpret_cast (item->get_data ("marker")); + assert (m); + if (m->meter().movable ()) { + _drags->set ( + new MeterMarkerDrag ( + this, + item, + Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier) + ), + event + ); + return true; + } else { + return false; + } + } case MarkerBarItem: case TempoBarItem: @@ -725,7 +829,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT if (dynamic_cast (clicked_axisview)) { _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event); return true; - } + } } else { _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); return true; @@ -770,7 +874,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT return true; } break; - + default: break; } @@ -778,7 +882,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) && event->type == GDK_BUTTON_PRESS) { - _drags->set (new RubberbandSelectDrag (this, item), event); + _drags->set (new EditorRubberbandSelectDrag (this, item), event); } else if (event->type == GDK_BUTTON_PRESS) { @@ -798,12 +902,12 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT } case FeatureLineItem: - { + { if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) { remove_transient(item); return true; } - + _drags->set (new FeatureLineDrag (this, item), event); return true; break; @@ -818,10 +922,13 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT } if (internal_editing ()) { - /* no region drags in internal edit mode */ + if (event->type == GDK_2BUTTON_PRESS && event->button.button == 1) { + Glib::RefPtr act = ActionManager::get_action (X_("MouseMode"), X_("toggle-internal-edit")); + act->activate (); + } break; } - + /* click on a normal region view */ if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) { add_region_copy_drag (item, event, clicked_regionview); @@ -830,8 +937,8 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT } else { add_region_drag (item, event, clicked_regionview); } - - if (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT && !selection->regions.empty()) { + + if (!internal_editing() && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT && !selection->regions.empty())) { _drags->add (new SelectionDrag (this, clicked_axisview->get_selection_rect (clicked_selection)->rect, SelectionDrag::SelectionMove)); } @@ -874,14 +981,24 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT } return true; } else { - _drags->set (new RubberbandSelectDrag (this, item), event); + _drags->set (new EditorRubberbandSelectDrag (this, item), event); } break; - + case AutomationTrackItem: - /* rubberband drag to select automation points */ - _drags->set (new RubberbandSelectDrag (this, item), event); + { + TimeAxisView* parent = clicked_axisview->get_parent (); + AutomationTimeAxisView* atv = dynamic_cast (clicked_axisview); + assert (atv); + if (parent && dynamic_cast (parent) && atv->show_regions ()) { + /* create a MIDI region so that we have somewhere to put automation */ + _drags->set (new RegionCreateDrag (this, item, parent), event); + } else { + /* rubberband drag to select automation points */ + _drags->set (new EditorRubberbandSelectDrag (this, item), event); + } break; + } case SelectionItem: { @@ -905,7 +1022,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT if (t) { boost::shared_ptr pl = t->playlist (); if (pl) { - + boost::shared_ptr r = pl->top_region_at (event_frame (event)); if (r) { RegionView* rv = rtv->view()->find_view (r); @@ -1054,7 +1171,7 @@ Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemT /* no region drags in internal edit mode */ return false; } - + if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) { add_region_copy_drag (item, event, clicked_regionview); } else { @@ -1097,6 +1214,9 @@ Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; + case MouseDraw: + return false; + case MouseRange: /* relax till release */ return true; @@ -1118,7 +1238,7 @@ Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemT return false; } - + bool Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) { @@ -1142,13 +1262,44 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp } pre_press_cursor = current_canvas_cursor; - + track_canvas->grab_focus(); if (_session && _session->actively_recording()) { return true; } + if (internal_editing()) { + switch (item_type) { + case NoteItem: + break; + + case RegionItem: + if (!dynamic_cast (clicked_regionview)) { + ActionManager::do_action ("MouseMode", "toggle-internal-edit"); + } + break; + + case PlayheadCursorItem: + case MarkerItem: + case TempoMarkerItem: + case MeterMarkerItem: + case MarkerBarItem: + case TempoBarItem: + case MeterBarItem: + case RangeMarkerBarItem: + case CdMarkerBarItem: + case TransportMarkerBarItem: + /* button press on these events never does anything to + change the editing mode. + */ + break; + + default: + ActionManager::do_action ("MouseMode", "toggle-internal-edit"); + } + } + button_selection (item, event, item_type); if (!_drags->active () && @@ -1273,6 +1424,8 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT if (Keyboard::is_context_menu_event (&event->button)) { + context_click_event = *event; + if (!_drags->active ()) { /* no matter which button pops up the context menu, tell the menu @@ -1332,6 +1485,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT popup_track_context_menu (1, event->button.time, item_type, false); break; + case ControlPointItem: + popup_control_point_context_menu (item, event); + break; + #ifdef WITH_CMT case ImageFrameItem: popup_imageframe_edit_menu(1, event->button.time, item, true) ; @@ -1381,11 +1538,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case ControlPointItem: - if (eff == MouseGain) { - remove_gain_control_point (item, event); - } else { - remove_control_point (item, event); - } + remove_control_point (item); break; case NoteItem: @@ -1450,7 +1603,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case AutomationTrackItem: atv = dynamic_cast(clicked_axisview); if (atv) { - atv->add_automation_event (item, event, where, event->button.y); + atv->add_automation_event (event, where, event->button.y); } return true; break; @@ -1478,7 +1631,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case AutomationTrackItem: dynamic_cast(clicked_axisview)-> - add_automation_event (item, event, where, event->button.y); + add_automation_event (event, where, event->button.y); return true; break; default: @@ -1505,7 +1658,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT default: break; - + } /* do any (de)selection operations that should occur on button release */ @@ -1536,8 +1689,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT } break; + case MouseDraw: + return true; + case MouseRange: - // x_style_paste (where, 1.0); return true; break; @@ -1566,8 +1721,6 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ double fraction; bool ret = true; - last_item_entered = item; - switch (item_type) { case ControlPointItem: if (mouse_mode == MouseGain || mouse_mode == MouseObject) { @@ -1631,17 +1784,21 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ break; case StartSelectionTrimItem: - case EndSelectionTrimItem: - #ifdef WITH_CMT case ImageFrameHandleStartItem: - case ImageFrameHandleEndItem: case MarkerViewHandleStartItem: +#endif + if (is_drawable()) { + set_canvas_cursor (_cursors->left_side_trim); + } + break; + case EndSelectionTrimItem: +#ifdef WITH_CMT + case ImageFrameHandleEndItem: case MarkerViewHandleEndItem: #endif - if (is_drawable()) { - set_canvas_cursor (_cursors->trimmer); + set_canvas_cursor (_cursors->right_side_trim); } break; @@ -1751,7 +1908,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ set_canvas_cursor (); } break; - + default: break; } @@ -1780,7 +1937,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ } bool -Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) +Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) { AutomationLine* al; ControlPoint* cp; @@ -1821,7 +1978,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ #endif _over_region_trim_target = false; - + if (is_drawable()) { set_canvas_cursor (current_canvas_cursor); } @@ -1843,7 +2000,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ case RegionViewName: /* see enter_handler() for notes */ _over_region_trim_target = false; - + if (!reinterpret_cast (item->get_data ("regionview"))->name_active()) { if (is_drawable() && mouse_mode == MouseObject) { set_canvas_cursor (current_canvas_cursor); @@ -2007,7 +2164,7 @@ bool Editor::motion_handler (ArdourCanvas::Item* /*item*/, GdkEvent* event, bool from_autoscroll) { _last_motion_y = event->motion.y; - + if (event->motion.is_hint) { gint x, y; @@ -2048,7 +2205,7 @@ Editor::motion_handler (ArdourCanvas::Item* /*item*/, GdkEvent* event, bool from if (_drags->active ()) { handled = _drags->motion_handler (event, from_autoscroll); } - + if (!handled) { return false; } @@ -2057,8 +2214,8 @@ Editor::motion_handler (ArdourCanvas::Item* /*item*/, GdkEvent* event, bool from return true; } -void -Editor::remove_gain_control_point (ArdourCanvas::Item*item, GdkEvent* /*event*/) +bool +Editor::can_remove_control_point (ArdourCanvas::Item* item) { ControlPoint* control_point; @@ -2067,18 +2224,24 @@ Editor::remove_gain_control_point (ArdourCanvas::Item*item, GdkEvent* /*event*/) /*NOTREACHED*/ } - // We shouldn't remove the first or last gain point - if (control_point->line().is_last_point(*control_point) || - control_point->line().is_first_point(*control_point)) { - return; + AutomationLine& line = control_point->line (); + if (dynamic_cast (&line)) { + /* we shouldn't remove the first or last gain point in region gain lines */ + if (line.is_last_point(*control_point) || line.is_first_point(*control_point)) { + return false; + } } - control_point->line().remove_point (*control_point); + return true; } void -Editor::remove_control_point (ArdourCanvas::Item* item, GdkEvent* /*event*/) +Editor::remove_control_point (ArdourCanvas::Item* item) { + if (!can_remove_control_point (item)) { + return; + } + ControlPoint* control_point; if ((control_point = reinterpret_cast (item->get_data ("control_point"))) == 0) { @@ -2122,7 +2285,7 @@ Editor::edit_note (ArdourCanvas::Item* item) d.run (); } - + void Editor::visible_order_range (int* low, int* high) const @@ -2385,7 +2548,7 @@ Editor::track_height_step_timeout () } void -Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view) +Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view) { assert (region_view); @@ -2407,7 +2570,7 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* } void -Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view) +Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view) { assert (region_view); @@ -2422,14 +2585,14 @@ Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionV } void -Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view) +Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view) { assert (region_view); if (!region_view->region()->playlist()) { return; } - + if (Config->get_edit_mode() == Splice) { return; } @@ -2517,13 +2680,8 @@ void Editor::set_internal_edit (bool yn) { _internal_editing = yn; - + if (yn) { - mouse_select_button.set_image (*(manage (new Image (::get_icon("midi_tool_pencil"))))); - mouse_select_button.get_image ()->show (); - ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Draw/Edit MIDI Notes")); - mouse_mode_toggled (mouse_mode); - pre_internal_mouse_mode = mouse_mode; for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { @@ -2531,39 +2689,35 @@ Editor::set_internal_edit (bool yn) } } else { - - mouse_select_button.set_image (*(manage (new Image (::get_icon("tool_range"))))); - mouse_select_button.get_image ()->show (); - ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Select/Move Ranges")); - mouse_mode_toggled (mouse_mode); // sets cursor - for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { (*i)->leave_internal_edit_mode (); } - if (mouse_mode == MouseRange && pre_internal_mouse_mode != MouseRange) { + if (mouse_mode == MouseDraw && pre_internal_mouse_mode != MouseDraw) { /* we were drawing .. flip back to something sensible */ set_mouse_mode (pre_internal_mouse_mode); } } + + set_canvas_cursor (); } /** Update _join_object_range_state which indicate whether we are over the top or bottom half of a region view, * used by the `join object/range' tool mode. */ void -Editor::update_join_object_range_location (double x, double y) +Editor::update_join_object_range_location (double /*x*/, double y) { /* XXX: actually, this decides based on whether the mouse is in the top or bottom half of a RouteTimeAxisView; entered_{track,regionview} is not always setup (e.g. if the mouse is over a TimeSelection), and to get a Region that we're over requires searching the playlist. */ - + if (join_object_range_button.get_active() == false || (mouse_mode != MouseRange && mouse_mode != MouseObject)) { _join_object_range_state = JOIN_OBJECT_RANGE_NONE; return; } - + if (mouse_mode == MouseObject) { _join_object_range_state = JOIN_OBJECT_RANGE_OBJECT; } else if (mouse_mode == MouseRange) { @@ -2572,7 +2726,7 @@ Editor::update_join_object_range_location (double x, double y) /* XXX: maybe we should make entered_track work in all cases, rather than resorting to this */ pair tvp = trackview_by_y_position (y + vertical_adjustment.get_value() - canvas_timebars_vsize); - + if (tvp.first) { RouteTimeAxisView* rtv = dynamic_cast (tvp.first); @@ -2616,7 +2770,7 @@ void Editor::set_canvas_cursor_for_region_view (double x, RegionView* rv) { assert (rv); - + ArdourCanvas::Group* g = rv->get_canvas_group (); ArdourCanvas::Group* p = g->get_parent_group ();