X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_mouse.cc;h=52105155417dd9fd90336da1f529f40fed3261af;hb=1474b10d39873538f93a466517f518c5013d1ac3;hp=aea06d6410686f0a3ee2a42779e44135c3d12559;hpb=3ae28868ff02abf44102fff9954e7e8d6359867f;p=ardour.git diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index aea06d6410..5210515541 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2001 Paul Davis + Copyright (C) 2000-2001 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -67,6 +67,7 @@ #include "ardour/utils.h" #include "ardour/region_factory.h" #include "ardour/source_factory.h" +#include "ardour/session.h" #include @@ -91,7 +92,7 @@ Editor::mouse_frame (nframes64_t& where, bool& in_track_canvas) const if (!canvas_window) { return false; } - + pointer_window = canvas_window->get_pointer (x, y, mask); if (pointer_window == track_canvas->get_bin_window()) { @@ -108,7 +109,7 @@ Editor::mouse_frame (nframes64_t& where, bool& in_track_canvas) const event.type = GDK_BUTTON_RELEASE; event.button.x = wx; event.button.y = wy; - + where = event_frame (&event, 0, 0); return true; } @@ -139,7 +140,7 @@ Editor::event_frame (GdkEvent const * event, double* pcx, double* pcy) const _trackview_group->w2i(*pcx, *pcy); break; case GDK_MOTION_NOTIFY: - + *pcx = event->motion.x; *pcy = event->motion.y; _trackview_group->w2i(*pcx, *pcy); @@ -161,7 +162,7 @@ Editor::event_frame (GdkEvent const * event, double* pcx, double* pcy) const position is negative (as can be the case with motion events in particular), the frame location is always positive. */ - + return pixel_to_frame (*pcx); } @@ -172,14 +173,14 @@ Editor::which_grabber_cursor () if (_internal_editing) { switch (mouse_mode) { - case MouseObject: + case MouseRange: c = midi_pencil_cursor; break; - - case MouseRange: - c = midi_select_cursor; + + case MouseObject: + c = grabber_cursor; break; - + case MouseTimeFX: c = midi_resize_cursor; break; @@ -208,14 +209,14 @@ Editor::set_canvas_cursor () if (_internal_editing) { switch (mouse_mode) { - case MouseObject: + case MouseRange: current_canvas_cursor = midi_pencil_cursor; break; - - case MouseRange: - current_canvas_cursor = midi_select_cursor; + + case MouseObject: + current_canvas_cursor = which_grabber_cursor(); break; - + case MouseTimeFX: current_canvas_cursor = midi_resize_cursor; break; @@ -230,23 +231,23 @@ Editor::set_canvas_cursor () case MouseRange: current_canvas_cursor = selector_cursor; break; - + case MouseObject: current_canvas_cursor = which_grabber_cursor(); break; - + case MouseGain: current_canvas_cursor = cross_hair_cursor; break; - + case MouseZoom: current_canvas_cursor = zoom_cursor; break; - + case MouseTimeFX: current_canvas_cursor = time_fx_cursor; // just use playhead break; - + case MouseAudition: current_canvas_cursor = speaker_cursor; break; @@ -301,6 +302,9 @@ Editor::set_mouse_mode (MouseMode m, bool force) Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); assert (tact); + + /* go there and back to ensure that the toggled handler is called to set up mouse_mode */ + tact->set_active (false); tact->set_active (true); } @@ -326,7 +330,7 @@ Editor::mouse_mode_toggled (MouseMode m) } else { - /* + /* in range mode,show the range selection. */ @@ -376,12 +380,12 @@ Editor::step_mouse_mode (bool next) } } break; - + case MouseGain: if (next) set_mouse_mode (MouseTimeFX); else set_mouse_mode (MouseZoom); break; - + case MouseTimeFX: if (next) { set_mouse_mode (MouseAudition); @@ -420,16 +424,16 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp (mouse_mode != MouseRange)) || ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3)) { - + return; } if (event->type == GDK_BUTTON_PRESS || event->type == GDK_BUTTON_RELEASE) { if ((event->button.state & Keyboard::RelevantModifierKeyMask) && event->button.button != 1) { - + /* almost no selection action on modified button-2 or button-3 events */ - + if (item_type != RegionItem && event->button.button != 2) { return; } @@ -440,7 +444,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp bool press = (event->type == GDK_BUTTON_PRESS); // begin_reversible_command (_("select on click")); - + switch (item_type) { case RegionItem: if (mouse_mode != MouseRange) { @@ -449,7 +453,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp set_selected_track_as_side_effect (); } break; - + case RegionViewNameHighlight: case RegionViewName: if (mouse_mode != MouseRange) { @@ -477,7 +481,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp set_selected_control_point_from_click (op, false); } break; - + case StreamItem: /* for context click or range selection, select track */ if (event->button.button == 3) { @@ -486,475 +490,433 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp set_selected_track_as_side_effect (); } break; - + case AutomationTrackItem: set_selected_track_as_side_effect (true); break; - + default: break; } } bool -Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) +Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) { - Glib::RefPtr canvas_window = const_cast(this)->track_canvas->get_window(); + if (_drag) { + _drag->item()->ungrab (event->button.time); + delete _drag; + _drag = 0; + } - if (canvas_window) { - Glib::RefPtr pointer_window; - int x, y; - double wx, wy; - Gdk::ModifierType mask; + /* single mouse clicks on any of these item types operate + independent of mouse mode, mostly because they are + not on the main track canvas or because we want + them to be modeless. + */ - pointer_window = canvas_window->get_pointer (x, y, mask); - - if (pointer_window == track_canvas->get_bin_window()) { - track_canvas->window_to_world (x, y, wx, wy); - allow_vertical_scroll = true; + switch (item_type) { + case PlayheadCursorItem: + assert (_drag == 0); + _drag = new CursorDrag (this, item, true); + _drag->start_grab (event); + return true; + + case MarkerItem: + if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { + hide_marker (item, event); } else { - allow_vertical_scroll = false; + assert (_drag == 0); + _drag = new MarkerDrag (this, item); + _drag->start_grab (event); } - } - - track_canvas->grab_focus(); + return true; - if (session && session->actively_recording()) { + case TempoMarkerItem: + assert (_drag == 0); + _drag = new TempoMarkerDrag ( + this, + item, + Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier) + ); + _drag->start_grab (event); return true; - } - button_selection (item, event, item_type); + case MeterMarkerItem: + assert (_drag == 0); + _drag = new MeterMarkerDrag ( + this, + item, + Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier) + ); + _drag->start_grab (event); + return true; - if (_drag == 0 && - (Keyboard::is_delete_event (&event->button) || - Keyboard::is_context_menu_event (&event->button) || - Keyboard::is_edit_event (&event->button))) { - - /* handled by button release */ + case MarkerBarItem: + case TempoBarItem: + case MeterBarItem: + if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { + assert (_drag == 0); + _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false); + _drag->start_grab (event); + } return true; - } + break; - switch (event->button.button) { - case 1: - if (event->type == GDK_BUTTON_PRESS) { + case RangeMarkerBarItem: + assert (_drag == 0); + if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { + _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false); + } else { + _drag = new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateRangeMarker); + } + _drag->start_grab (event); + return true; + break; - if (_drag) { - _drag->item()->ungrab (event->button.time); - } + case CdMarkerBarItem: + assert (_drag == 0); + if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { + _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false); + } else { + _drag = new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateCDMarker); + } + _drag->start_grab (event); + return true; + break; - /* single mouse clicks on any of these item types operate - independent of mouse mode, mostly because they are - not on the main track canvas or because we want - them to be modeless. - */ + case TransportMarkerBarItem: + assert (_drag == 0); + if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { + _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false); + } else { + _drag = new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateTransportMarker); + } + _drag->start_grab (event); + return true; + break; - switch (item_type) { - case PlayheadCursorItem: + default: + break; + } + + if (internal_editing()) { + switch (item_type) { + case StreamItem: + assert (_drag == 0); + _drag = new RegionCreateDrag (this, item, clicked_axisview); + _drag->start_grab (event); + return true; + case NoteItem: + /* Note: we don't get here if not in internal_editing() mode */ + if (mouse_mode == MouseTimeFX) { assert (_drag == 0); - _drag = new CursorDrag (this, item, true); + _drag = new NoteResizeDrag (this, item); _drag->start_grab (event); return true; - - case MarkerItem: - if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { - hide_marker (item, event); - } else { - assert (_drag == 0); - _drag = new MarkerDrag (this, item); - _drag->start_grab (event); - } - return true; - - case TempoMarkerItem: + } else if (mouse_mode == MouseObject) { assert (_drag == 0); - _drag = new TempoMarkerDrag ( - this, - item, - Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier) - ); + _drag = new NoteDrag (this, item); _drag->start_grab (event); return true; - - case MeterMarkerItem: + } else { + return false; + } + break; + default: + return true; + } + } else { + switch (mouse_mode) { + case MouseRange: + switch (item_type) { + case StartSelectionTrimItem: assert (_drag == 0); - - _drag = new MeterMarkerDrag ( - this, - item, - Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier) - ); - + _drag = new SelectionDrag (this, item, SelectionDrag::SelectionStartTrim); _drag->start_grab (event); - return true; - - case MarkerBarItem: - case TempoBarItem: - case MeterBarItem: - if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { - assert (_drag == 0); - _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false); - _drag->start_grab (event); - } - return true; break; - - case RangeMarkerBarItem: + case EndSelectionTrimItem: assert (_drag == 0); - if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { - _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false); - } else { - _drag = new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateRangeMarker); - } + _drag = new SelectionDrag (this, item, SelectionDrag::SelectionEndTrim); _drag->start_grab (event); - return true; break; - case CdMarkerBarItem: - assert (_drag == 0); - if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { - _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false); + case SelectionItem: + if (Keyboard::modifier_state_contains + (event->button.state, Keyboard::ModifierMask(Keyboard::SecondaryModifier))) { + // contains and not equals because I can't use alt as a modifier alone. + start_selection_grab (item, event); + } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { + /* grab selection for moving */ + assert (_drag == 0); + _drag = new SelectionDrag (this, item, SelectionDrag::SelectionMove); + _drag->start_grab (event); } else { - _drag = new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateCDMarker); + /* this was debated, but decided the more common action was to + make a new selection */ + assert (_drag == 0); + _drag = new SelectionDrag (this, item, SelectionDrag::CreateSelection); + _drag->start_grab (event); } - _drag->start_grab (event); - return true; break; - case TransportMarkerBarItem: + default: assert (_drag == 0); - if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { - _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false); - } else { - _drag = new RangeMarkerBarDrag (this, item, RangeMarkerBarDrag::CreateTransportMarker); - } + _drag = new SelectionDrag (this, item, SelectionDrag::CreateSelection); _drag->start_grab (event); - return true; - break; - - default: - break; } - } + return true; + break; - if (internal_editing()) { - assert (_drag == 0); - _drag = new RegionCreateDrag (this, item, clicked_axisview); - _drag->start_grab (event); - cerr << "--- DRAG START FOR RCD\n"; - } else { - switch (mouse_mode) { - case MouseRange: - switch (item_type) { - case StartSelectionTrimItem: - assert (_drag == 0); - _drag = new SelectionDrag (this, item, SelectionDrag::SelectionStartTrim); - _drag->start_grab (event); - break; - - case EndSelectionTrimItem: - assert (_drag == 0); - _drag = new SelectionDrag (this, item, SelectionDrag::SelectionEndTrim); - _drag->start_grab (event); - break; + case MouseObject: + if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) && + event->type == GDK_BUTTON_PRESS) { - case SelectionItem: - if (Keyboard::modifier_state_contains - (event->button.state, Keyboard::ModifierMask(Keyboard::SecondaryModifier))) { - // contains and not equals because I can't use alt as a modifier alone. - start_selection_grab (item, event); - } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { - /* grab selection for moving */ - assert (_drag == 0); - _drag = new SelectionDrag (this, item, SelectionDrag::SelectionMove); - _drag->start_grab (event); - } else { - /* this was debated, but decided the more common action was to - make a new selection */ - assert (_drag == 0); - _drag = new SelectionDrag (this, item, SelectionDrag::CreateSelection); - _drag->start_grab (event); - } - break; + assert (_drag == 0); + _drag = new RubberbandSelectDrag (this, item); + _drag->start_grab (event); - default: + } else if (event->type == GDK_BUTTON_PRESS) { + + switch (item_type) { + case FadeInHandleItem: + { assert (_drag == 0); - _drag = new SelectionDrag (this, item, SelectionDrag::CreateSelection); + RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); + _drag = new FadeInDrag (this, item, reinterpret_cast (item->get_data("regionview")), s); _drag->start_grab (event); + return true; } - return true; - break; - - case MouseObject: - if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) && - event->type == GDK_BUTTON_PRESS) { + case FadeOutHandleItem: + { assert (_drag == 0); - _drag = new RubberbandSelectDrag (this, item); + RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); + _drag = new FadeOutDrag (this, item, reinterpret_cast (item->get_data("regionview")), s); _drag->start_grab (event); - - } else if (event->type == GDK_BUTTON_PRESS) { - - switch (item_type) { - case FadeInHandleItem: - { - assert (_drag == 0); - RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); - _drag = new FadeInDrag (this, item, reinterpret_cast (item->get_data("regionview")), s); - _drag->start_grab (event); - return true; - } - - case FadeOutHandleItem: - { - assert (_drag == 0); - RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); - _drag = new FadeOutDrag (this, item, reinterpret_cast (item->get_data("regionview")), s); - _drag->start_grab (event); - return true; - } - - case RegionItem: - if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) { - start_region_copy_grab (item, event, clicked_regionview); - } else if (Keyboard::the_keyboard().key_is_down (GDK_b)) { - start_region_brush_grab (item, event, clicked_regionview); - } else { - start_region_grab (item, event, clicked_regionview); - } - break; - - case RegionViewNameHighlight: - { - assert (_drag == 0); - RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); - _drag = new TrimDrag (this, item, clicked_regionview, s.by_layer()); - _drag->start_grab (event); - return true; - break; - } - - case RegionViewName: - { - /* rename happens on edit clicks */ - assert (_drag == 0); - RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); - _drag = new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, s.by_layer()); - _drag->start_grab (event); - return true; - break; - } - - case ControlPointItem: - assert (_drag == 0); - _drag = new ControlPointDrag (this, item); - _drag->start_grab (event); - return true; - break; - - case AutomationLineItem: - assert (_drag == 0); - _drag = new LineDrag (this, item); - _drag->start_grab (event); - return true; - break; - - case StreamItem: - case AutomationTrackItem: - assert (_drag == 0); - _drag = new RubberbandSelectDrag (this, item); - _drag->start_grab (event); - break; - -#ifdef WITH_CMT - case ImageFrameHandleStartItem: - imageframe_start_handle_op(item, event) ; - return(true) ; - break ; - case ImageFrameHandleEndItem: - imageframe_end_handle_op(item, event) ; - return(true) ; - break ; - case MarkerViewHandleStartItem: - markerview_item_start_handle_op(item, event) ; - return(true) ; - break ; - case MarkerViewHandleEndItem: - markerview_item_end_handle_op(item, event) ; - return(true) ; - break ; - case MarkerViewItem: - start_markerview_grab(item, event) ; - break ; - case ImageFrameItem: - start_imageframe_grab(item, event) ; - break ; -#endif - - case MarkerBarItem: - - break; - - default: - break; - } + return true; } - return true; - break; - - case MouseGain: - switch (item_type) { + case RegionItem: - /* start a grab so that if we finish after moving - we can tell what happened. - */ - assert (_drag == 0); - _drag = new RegionGainDrag (this, item); - _drag->start_grab (event, current_canvas_cursor); + if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) { + start_region_copy_grab (item, event, clicked_regionview); + } else if (Keyboard::the_keyboard().key_is_down (GDK_b)) { + start_region_brush_grab (item, event, clicked_regionview); + } else { + start_region_grab (item, event, clicked_regionview); + } break; - case GainLineItem: + case RegionViewNameHighlight: + { assert (_drag == 0); - _drag = new LineDrag (this, item); + RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); + _drag = new TrimDrag (this, item, clicked_regionview, s.by_layer()); _drag->start_grab (event); return true; + break; + } - case ControlPointItem: + case RegionViewName: + { + /* rename happens on edit clicks */ assert (_drag == 0); - _drag = new ControlPointDrag (this, item); + RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); + _drag = new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, s.by_layer()); _drag->start_grab (event); return true; break; - - default: - break; } - return true; - break; - switch (item_type) { case ControlPointItem: assert (_drag == 0); _drag = new ControlPointDrag (this, item); _drag->start_grab (event); + return true; break; case AutomationLineItem: assert (_drag == 0); _drag = new LineDrag (this, item); _drag->start_grab (event); + return true; break; - case RegionItem: - // XXX need automation mode to identify which - // line to use - // start_line_grab_from_regionview (item, event); + case StreamItem: + case AutomationTrackItem: + assert (_drag == 0); + _drag = new RubberbandSelectDrag (this, item); + _drag->start_grab (event); break; - default: +#ifdef WITH_CMT + case ImageFrameHandleStartItem: + imageframe_start_handle_op(item, event) ; + return(true) ; + break ; + case ImageFrameHandleEndItem: + imageframe_end_handle_op(item, event) ; + return(true) ; + break ; + case MarkerViewHandleStartItem: + markerview_item_start_handle_op(item, event) ; + return(true) ; + break ; + case MarkerViewHandleEndItem: + markerview_item_end_handle_op(item, event) ; + return(true) ; + break ; + case MarkerViewItem: + start_markerview_grab(item, event) ; + break ; + case ImageFrameItem: + start_imageframe_grab(item, event) ; + break ; +#endif + + case MarkerBarItem: + break; - } - return true; - break; - case MouseZoom: - if (event->type == GDK_BUTTON_PRESS) { - assert (_drag == 0); - _drag = new MouseZoomDrag (this, item); - _drag->start_grab (event); + default: + break; } + } + return true; + break; - return true; + case MouseGain: + switch (item_type) { + case RegionItem: + /* start a grab so that if we finish after moving + we can tell what happened. + */ + assert (_drag == 0); + _drag = new RegionGainDrag (this, item); + _drag->start_grab (event, current_canvas_cursor); break; - case MouseTimeFX: - if (item_type == RegionItem) { - assert (_drag == 0); - _drag = new TimeFXDrag (this, item, clicked_regionview, selection->regions.by_layer()); - _drag->start_grab (event); - } - break; + case GainLineItem: + assert (_drag == 0); + _drag = new LineDrag (this, item); + _drag->start_grab (event); + return true; - case MouseAudition: - _drag = new ScrubDrag (this, item); + case ControlPointItem: + assert (_drag == 0); + _drag = new ControlPointDrag (this, item); _drag->start_grab (event); - scrub_reversals = 0; - scrub_reverse_distance = 0; - last_scrub_x = event->button.x; - scrubbing_direction = 0; - track_canvas->get_window()->set_cursor (*transparent_cursor); + return true; break; default: break; } - } - break; + return true; + break; - case 2: - switch (mouse_mode) { - case MouseObject: - if (event->type == GDK_BUTTON_PRESS) { - switch (item_type) { - case RegionItem: - if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) { - start_region_copy_grab (item, event, clicked_regionview); - } else { - start_region_grab (item, event, clicked_regionview); - } - return true; - break; - case ControlPointItem: - assert (_drag == 0); - _drag = new ControlPointDrag (this, item); - _drag->start_grab (event); - return true; - break; - - default: - break; - } - } - - switch (item_type) { - case RegionViewNameHighlight: + case ControlPointItem: assert (_drag == 0); - _drag = new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()); + _drag = new ControlPointDrag (this, item); _drag->start_grab (event); - return true; break; - - case RegionViewName: + + case AutomationLineItem: assert (_drag == 0); - _drag = new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, selection->regions.by_layer()); + _drag = new LineDrag (this, item); _drag->start_grab (event); - return true; break; - + + case RegionItem: + // XXX need automation mode to identify which + // line to use + // start_line_grab_from_regionview (item, event); + break; + default: break; } - + return true; break; - case MouseRange: + case MouseZoom: if (event->type == GDK_BUTTON_PRESS) { - /* relax till release */ + assert (_drag == 0); + _drag = new MouseZoomDrag (this, item); + _drag->start_grab (event); } + return true; break; - - - case MouseZoom: - if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { - temporal_zoom_session(); + + case MouseTimeFX: + if (item_type == RegionItem) { + assert (_drag == 0); + _drag = new TimeFXDrag (this, item, clicked_regionview, selection->regions.by_layer()); + _drag->start_grab (event); + } + break; + + case MouseAudition: + _drag = new ScrubDrag (this, item); + _drag->start_grab (event); + scrub_reversals = 0; + scrub_reverse_distance = 0; + last_scrub_x = event->button.x; + scrubbing_direction = 0; + track_canvas->get_window()->set_cursor (*transparent_cursor); + break; + + default: + break; + } + } + + return false; +} + +bool +Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) +{ + switch (mouse_mode) { + case MouseObject: + switch (item_type) { + case RegionItem: + if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) { + start_region_copy_grab (item, event, clicked_regionview); } else { - temporal_zoom_to_frame (true, event_frame(event)); + start_region_grab (item, event, clicked_regionview); } return true; break; + case ControlPointItem: + assert (_drag == 0); + _drag = new ControlPointDrag (this, item); + _drag->start_grab (event); + return true; + break; + + default: + break; + } + + switch (item_type) { + case RegionViewNameHighlight: + assert (_drag == 0); + _drag = new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()); + _drag->start_grab (event); + return true; + break; + + case RegionViewName: + assert (_drag == 0); + _drag = new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, selection->regions.by_layer()); + _drag->start_grab (event); + return true; + break; default: break; @@ -962,6 +924,79 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp break; + case MouseRange: + /* relax till release */ + return true; + break; + + + case MouseZoom: + if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { + temporal_zoom_session(); + } else { + temporal_zoom_to_frame (true, event_frame(event)); + } + return true; + break; + + default: + break; + } + + return false; +} + +bool +Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) +{ + if (event->type != GDK_BUTTON_PRESS) { + return false; + } + + Glib::RefPtr canvas_window = const_cast(this)->track_canvas->get_window(); + + if (canvas_window) { + Glib::RefPtr pointer_window; + int x, y; + double wx, wy; + Gdk::ModifierType mask; + + pointer_window = canvas_window->get_pointer (x, y, mask); + + if (pointer_window == track_canvas->get_bin_window()) { + track_canvas->window_to_world (x, y, wx, wy); + allow_vertical_scroll = true; + } else { + allow_vertical_scroll = false; + } + } + + track_canvas->grab_focus(); + + if (session && session->actively_recording()) { + return true; + } + + button_selection (item, event, item_type); + + if (_drag == 0 && + (Keyboard::is_delete_event (&event->button) || + Keyboard::is_context_menu_event (&event->button) || + Keyboard::is_edit_event (&event->button))) { + + /* handled by button release */ + return true; + } + + switch (event->button.button) { + case 1: + return button_press_handler_1 (item, event, item_type); + break; + + case 2: + return button_press_handler_2 (item, event, item_type); + break; + case 3: break; @@ -978,9 +1013,9 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT { nframes64_t where = event_frame (event, 0, 0); AutomationTimeAxisView* atv = 0; - + /* no action if we're recording */ - + if (session && session->actively_recording()) { return true; } @@ -992,7 +1027,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT bool const r = _drag->end_grab (event); delete _drag; _drag = 0; - cerr << "DRAG DONE, r = " << r << endl; if (r) { /* grab dragged, so do nothing else */ return true; @@ -1000,7 +1034,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT were_dragging = true; } - + button_selection (item, event, item_type); /* edit events get handled here */ @@ -1014,11 +1048,11 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case TempoMarkerItem: edit_tempo_marker (item); break; - + case MeterMarkerItem: edit_meter_marker (item); break; - + case RegionViewName: if (clicked_regionview->name_active()) { return mouse_rename_region (item, event); @@ -1052,17 +1086,17 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case FadeOutHandleItem: popup_fade_context_menu (1, event->button.time, item, item_type); break; - + case StreamItem: popup_track_context_menu (1, event->button.time, item_type, false, where); break; - + case RegionItem: case RegionViewNameHighlight: case RegionViewName: popup_track_context_menu (1, event->button.time, item_type, false, where); break; - + case SelectionItem: popup_track_context_menu (1, event->button.time, item_type, true, where); break; @@ -1071,8 +1105,8 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT popup_track_context_menu (1, event->button.time, item_type, false, where); break; - case MarkerBarItem: - case RangeMarkerBarItem: + case MarkerBarItem: + case RangeMarkerBarItem: case TransportMarkerBarItem: case CdMarkerBarItem: case TempoBarItem: @@ -1087,11 +1121,11 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case TempoMarkerItem: tm_marker_context_menu (&event->button, item); break; - + case MeterMarkerItem: tm_marker_context_menu (&event->button, item); break; - + case CrossfadeViewItem: popup_track_context_menu (1, event->button.time, item_type, false, where); break; @@ -1110,7 +1144,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT popup_marker_time_axis_edit_menu(1, event->button.time, item, false) ; break ; #endif - + default: break; } @@ -1127,7 +1161,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case TempoMarkerItem: remove_tempo_marker (item); break; - + case MeterMarkerItem: remove_meter_marker (item); break; @@ -1141,7 +1175,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT remove_clicked_region (); } break; - + case ControlPointItem: if (mouse_mode == MouseGain) { remove_gain_control_point (item, event); @@ -1171,9 +1205,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case MarkerBarItem: if (!_dragging_playhead) { - if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) { - snap_to (where, 0, true); - } + snap_to_with_modifier (where, event, 0, true); mouse_add_new_marker (where); } return true; @@ -1181,33 +1213,29 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case CdMarkerBarItem: if (!_dragging_playhead) { // if we get here then a dragged range wasn't done - if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) { - snap_to (where, 0, true); - } + snap_to_with_modifier (where, event, 0, true); mouse_add_new_marker (where, true); } return true; case TempoBarItem: if (!_dragging_playhead) { - if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) { - snap_to (where); - } + snap_to_with_modifier (where, event); mouse_add_new_tempo_event (where); } return true; - + case MeterBarItem: if (!_dragging_playhead) { mouse_add_new_meter_event (pixel_to_frame (event->button.x)); - } + } return true; break; default: break; } - + switch (mouse_mode) { case MouseObject: switch (item_type) { @@ -1215,11 +1243,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT atv = dynamic_cast(clicked_axisview); if (atv) { atv->add_automation_event (item, event, where, event->button.y); - } + } return true; - break; - + default: break; } @@ -1243,7 +1270,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT } return true; break; - + case AutomationTrackItem: dynamic_cast(clicked_axisview)-> add_automation_event (item, event, where, event->button.y); @@ -1253,7 +1280,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; } break; - + case MouseAudition: track_canvas->get_window()->set_cursor (*current_canvas_cursor); if (scrubbing_direction == 0) { @@ -1268,9 +1295,9 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT } else { /* make sure we stop */ session->request_transport_speed (0.0); - } + } break; - + default: break; @@ -1282,7 +1309,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case 2: switch (mouse_mode) { - + case MouseObject: switch (item_type) { case RegionItem: @@ -1294,29 +1321,29 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT // Button2 click is unused } return true; - + break; - + default: break; } break; - + case MouseRange: - + // x_style_paste (where, 1.0); return true; break; - + default: break; } break; - + case 3: break; - + default: break; } @@ -1329,7 +1356,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* /*event*/, ItemType i ControlPoint* cp; Marker * marker; double fraction; - + if (last_item_entered != item) { last_item_entered = item; last_item_entered_n = 0; @@ -1372,7 +1399,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* /*event*/, ItemType i } } break; - + case AutomationLineItem: if (mouse_mode == MouseGain || mouse_mode == MouseObject) { { @@ -1385,7 +1412,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* /*event*/, ItemType i } } break; - + case RegionViewNameHighlight: if (is_drawable() && mouse_mode == MouseObject) { track_canvas->get_window()->set_cursor (*trimmer_cursor); @@ -1421,14 +1448,14 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* /*event*/, ItemType i break; case RegionViewName: - + /* when the name is not an active item, the entire name highlight is for trimming */ if (!reinterpret_cast (item->get_data ("regionview"))->name_active()) { if (mouse_mode == MouseObject && is_drawable()) { track_canvas->get_window()->set_cursor (*trimmer_cursor); } - } + } break; @@ -1537,14 +1564,14 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* /*event*/, ItemType i cp->set_visible (false); } } - + if (is_drawable()) { track_canvas->get_window()->set_cursor (*current_canvas_cursor); } hide_verbose_canvas_cursor (); break; - + case RegionViewNameHighlight: case StartSelectionTrimItem: case EndSelectionTrimItem: @@ -1594,7 +1621,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* /*event*/, ItemType i track_canvas->get_window()->set_cursor (*current_canvas_cursor); } break; - + case MarkerItem: if ((marker = static_cast (item->get_data ("marker"))) == 0) { break; @@ -1606,7 +1633,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* /*event*/, ItemType i // fall through case MeterMarkerItem: case TempoMarkerItem: - + if (is_drawable()) { track_canvas->get_window()->set_cursor (*timebar_cursor); } @@ -1632,7 +1659,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* /*event*/, ItemType i Glib::signal_idle().connect (mem_fun(*this, &Editor::left_automation_track)); } break; - + default: break; } @@ -1654,63 +1681,63 @@ void Editor::scrub () { double delta; - + if (scrubbing_direction == 0) { /* first move */ session->request_locate (_drag->current_pointer_frame(), false); session->request_transport_speed (0.1); scrubbing_direction = 1; - + } else { - + if (last_scrub_x > _drag->current_pointer_x()) { - + /* pointer moved to the left */ - + if (scrubbing_direction > 0) { - + /* we reversed direction to go backwards */ - + scrub_reversals++; scrub_reverse_distance += (int) (last_scrub_x - _drag->current_pointer_x()); - + } else { - + /* still moving to the left (backwards) */ - + scrub_reversals = 0; scrub_reverse_distance = 0; - + delta = 0.01 * (last_scrub_x - _drag->current_pointer_x()); session->request_transport_speed (session->transport_speed() - delta); } - + } else { /* pointer moved to the right */ - + if (scrubbing_direction < 0) { /* we reversed direction to go forward */ - + scrub_reversals++; scrub_reverse_distance += (int) (_drag->current_pointer_x() - last_scrub_x); - + } else { /* still moving to the right */ - + scrub_reversals = 0; scrub_reverse_distance = 0; - + delta = 0.01 * (_drag->current_pointer_x() - last_scrub_x); session->request_transport_speed (session->transport_speed() + delta); } } - + /* if there have been more than 2 opposite motion moves detected, or one that moves back more than 10 pixels, reverse direction */ - + if (scrub_reversals >= 2 || scrub_reverse_distance > 10) { - + if (scrubbing_direction > 0) { /* was forwards, go backwards */ session->request_transport_speed (-0.1); @@ -1720,12 +1747,12 @@ Editor::scrub () session->request_transport_speed (0.1); scrubbing_direction = 1; } - + scrub_reverse_distance = 0; scrub_reversals = 0; } } - + last_scrub_x = _drag->current_pointer_x(); } @@ -1734,18 +1761,18 @@ Editor::motion_handler (ArdourCanvas::Item* /*item*/, GdkEvent* event, bool from { if (event->motion.is_hint) { gint x, y; - + /* We call this so that MOTION_NOTIFY events continue to be delivered to the canvas. We need to do this because we set Gdk::POINTER_MOTION_HINT_MASK on the canvas. This reduces the density of the events, at the expense of a round-trip to the server. Given that this will mostly occur on cases where DISPLAY = :0.0, and given the cost of what the motion - event might do, its a good tradeoff. + event might do, its a good tradeoff. */ track_canvas->get_pointer (x, y); - } + } if (current_stepping_trackview) { /* don't keep the persistent stepped trackview if the mouse moves */ @@ -1783,7 +1810,7 @@ Editor::remove_gain_control_point (ArdourCanvas::Item*item, GdkEvent* /*event*/) // 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)) { + control_point->line().is_first_point(*control_point)) { return; } @@ -1830,17 +1857,17 @@ Editor::visible_order_range (int* low, int* high) const { *low = TimeAxisView::max_order (); *high = 0; - + for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) { RouteTimeAxisView* rtv = dynamic_cast (*i); - + if (!rtv->hidden()) { - + if (*high < rtv->order()) { *high = rtv->order (); } - + if (*low > rtv->order()) { *low = rtv->order (); } @@ -1854,7 +1881,7 @@ Editor::region_view_item_click (AudioRegionView& rv, GdkEventButton* event) /* Either add to or set the set the region selection, unless this is an alignment click (control used) */ - + if (Keyboard::modifier_state_contains (event->state, Keyboard::PrimaryModifier)) { TimeAxisView* tv = &rv.get_time_axis_view(); RouteTimeAxisView* rtv = dynamic_cast(tv); @@ -1868,15 +1895,15 @@ Editor::region_view_item_click (AudioRegionView& rv, GdkEventButton* event) if (where >= 0) { if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) { - + align_region (rv.region(), SyncPoint, (nframes64_t) (where * speed)); - + } else if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { - + align_region (rv.region(), End, (nframes64_t) (where * speed)); - + } else { - + align_region (rv.region(), Start, (nframes64_t) (where * speed)); } } @@ -1884,10 +1911,10 @@ Editor::region_view_item_click (AudioRegionView& rv, GdkEventButton* event) } void -Editor::show_verbose_time_cursor (nframes64_t frame, double offset, double xpos, double ypos) +Editor::show_verbose_time_cursor (nframes64_t frame, double offset, double xpos, double ypos) { char buf[128]; - SMPTE::Time smpte; + Timecode::Time timecode; BBT_Time bbt; int hours, mins; nframes64_t frame_rate; @@ -1910,10 +1937,10 @@ Editor::show_verbose_time_cursor (nframes64_t frame, double offset, double xpos, session->bbt_time (frame, bbt); snprintf (buf, sizeof (buf), "%02" PRIu32 "|%02" PRIu32 "|%02" PRIu32, bbt.bars, bbt.beats, bbt.ticks); break; - - case AudioClock::SMPTE: - session->smpte_time (frame, smpte); - snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%02" PRId32 ":%02" PRId32, smpte.hours, smpte.minutes, smpte.seconds, smpte.frames); + + case AudioClock::Timecode: + session->timecode_time (frame, timecode); + snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%02" PRId32 ":%02" PRId32, timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); break; case AudioClock::MinSec: @@ -1934,18 +1961,17 @@ Editor::show_verbose_time_cursor (nframes64_t frame, double offset, double xpos, if (xpos >= 0 && ypos >=0) { set_verbose_canvas_cursor (buf, xpos + offset, ypos + offset); - } - else { + } else { set_verbose_canvas_cursor (buf, _drag->current_pointer_x() + offset - horizontal_adjustment.get_value(), _drag->current_pointer_y() + offset - vertical_adjustment.get_value() + canvas_timebars_vsize); } show_verbose_canvas_cursor (); } void -Editor::show_verbose_duration_cursor (nframes64_t start, nframes64_t end, double offset, double xpos, double ypos) +Editor::show_verbose_duration_cursor (nframes64_t start, nframes64_t end, double offset, double xpos, double ypos) { char buf[128]; - SMPTE::Time smpte; + Timecode::Time timecode; BBT_Time sbbt; BBT_Time ebbt; int hours, mins; @@ -1988,13 +2014,13 @@ Editor::show_verbose_duration_cursor (nframes64_t start, nframes64_t end, double ebbt.beats--; ebbt.ticks = int(Meter::ticks_per_beat) + ebbt.ticks - sbbt.ticks; } - + snprintf (buf, sizeof (buf), "%02" PRIu32 "|%02" PRIu32 "|%02" PRIu32, ebbt.bars, ebbt.beats, ebbt.ticks); break; - - case AudioClock::SMPTE: - session->smpte_duration (end - start, smpte); - snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%02" PRId32 ":%02" PRId32, smpte.hours, smpte.minutes, smpte.seconds, smpte.frames); + + case AudioClock::Timecode: + session->timecode_duration (end - start, timecode); + snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%02" PRId32 ":%02" PRId32, timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); break; case AudioClock::MinSec: @@ -2046,7 +2072,7 @@ Editor::cancel_selection () selection->clear (); clicked_selection = 0; -} +} void @@ -2067,7 +2093,7 @@ Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left if (tv && tv->is_track()) { speed = tv->get_diskstream()->speed(); } - + if (left_direction) { if (swap_direction) { new_bound = (nframes64_t) (region->position()/speed) + frame_delta; @@ -2085,14 +2111,14 @@ Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left if (obey_snap) { snap_to (new_bound); } - region->trim_start ((nframes64_t) (new_bound * speed), this); + region->trim_start ((nframes64_t) (new_bound * speed), this); rv.region_changed (StartChanged); } void Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool obey_snap, bool no_overlap) { - boost::shared_ptr region (rv.region()); + boost::shared_ptr region (rv.region()); if (region->locked()) { return; @@ -2107,7 +2133,7 @@ Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_di if (tv && tv->is_track()) { speed = tv->get_diskstream()->speed(); } - + if (left_direction) { new_bound = (nframes64_t) (region->position()/speed) - frame_delta; } else { @@ -2115,18 +2141,18 @@ Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_di } if (obey_snap) { - snap_to (new_bound, (left_direction ? 0 : 1)); + snap_to (new_bound, (left_direction ? 0 : 1)); } - + nframes64_t pre_trim_first_frame = region->first_frame(); region->trim_front ((nframes64_t) (new_bound * speed), this); - + if (no_overlap) { //Get the next region on the left of this region and shrink/expand it. boost::shared_ptr playlist (region->playlist()); boost::shared_ptr region_left = playlist->find_next_region (pre_trim_first_frame, End, 0); - + bool regions_touching = false; if (region_left != 0 && (pre_trim_first_frame == region_left->last_frame() + 1)){ @@ -2134,14 +2160,14 @@ Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_di } //Only trim region on the left if the first frame has gone beyond the left region's last frame. - if (region_left != 0 && - (region_left->last_frame() > region->first_frame() || regions_touching)) + if (region_left != 0 && + (region_left->last_frame() > region->first_frame() || regions_touching)) { region_left->trim_end(region->first_frame(), this); } } - + rv.region_changed (Change (LengthChanged|PositionChanged|StartChanged)); } @@ -2192,11 +2218,11 @@ Editor::single_end_trim (RegionView& rv, nframes64_t frame_delta, bool left_dire //Only trim region on the right if the last frame has gone beyond the right region's first frame. if (region_right != 0 && - (region_right->first_frame() < region->last_frame() || regions_touching)) + (region_right->first_frame() < region->last_frame() || regions_touching)) { region_right->trim_front(region->last_frame() + 1, this); } - + rv.region_changed (Change (LengthChanged|PositionChanged|StartChanged)); } else { @@ -2212,9 +2238,7 @@ Editor::point_trim (GdkEvent* event) nframes64_t new_bound = _drag->current_pointer_frame(); - if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) { - snap_to (new_bound); - } + snap_to_with_modifier (new_bound, event); /* Choose action dependant on which button was pressed */ switch (event->button.button) { @@ -2251,13 +2275,13 @@ Editor::point_trim (GdkEvent* event) } commit_reversible_command(); - + break; case 2: begin_reversible_command (_("End point trim")); if (selection->selected (rv)) { - + for (list::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) { if (!(*i)->region()->locked()) { @@ -2281,7 +2305,7 @@ Editor::point_trim (GdkEvent* event) } commit_reversible_command(); - + break; default: break; @@ -2300,7 +2324,7 @@ Editor::thaw_region_after_trim (RegionView& rv) region->thaw (_("trimmed region")); AudioRegionView* arv = dynamic_cast(&rv); - + if (arv) { arv->unhide_envelope (); } @@ -2317,7 +2341,7 @@ Editor::hide_marker (ArdourCanvas::Item* item, GdkEvent* /*event*/) /*NOTREACHED*/ } - Location* location = find_location_from_marker (marker, is_start); + Location* location = find_location_from_marker (marker, is_start); location->set_hidden (true, this); } @@ -2366,14 +2390,14 @@ Editor::mouse_brush_insert_region (RegionView* rv, nframes64_t pos) { /* no brushing without a useful snap setting */ - switch (snap_mode) { + switch (_snap_mode) { case SnapMagnetic: return; /* can't work because it allows region to be placed anywhere */ default: break; /* OK */ } - switch (snap_type) { + switch (_snap_type) { case SnapToMark: return; @@ -2382,7 +2406,7 @@ Editor::mouse_brush_insert_region (RegionView* rv, nframes64_t pos) } /* don't brush a copy over the original */ - + if (pos == rv->region()->position()) { return; } @@ -2395,14 +2419,14 @@ Editor::mouse_brush_insert_region (RegionView* rv, nframes64_t pos) boost::shared_ptr playlist = rtv->playlist(); double speed = rtv->get_diskstream()->speed(); - + XMLNode &before = playlist->get_state(); playlist->add_region (RegionFactory::create (rv->region()), (nframes64_t) (pos * speed)); XMLNode &after = playlist->get_state(); session->add_command(new MementoCommand(*playlist.get(), &before, &after)); - + // playlist is frozen, so we have to update manually - + playlist->Modified(); /* EMIT SIGNAL */ } @@ -2422,16 +2446,16 @@ Editor::start_region_grab (ArdourCanvas::Item* item, GdkEvent* event, RegionView assert (region_view); _region_motion_group->raise_to_top (); - + assert (_drag == 0); - + if (Config->get_edit_mode() == Splice) { _drag = new RegionSpliceDrag (this, item, region_view, selection->regions.by_layer()); } else { RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); _drag = new RegionMoveDrag (this, item, region_view, s.by_layer(), false, false); } - + _drag->start_grab (event); begin_reversible_command (_("move region(s)")); @@ -2445,7 +2469,7 @@ Editor::start_region_copy_grab (ArdourCanvas::Item* item, GdkEvent* event, Regio { assert (region_view); assert (_drag == 0); - + _region_motion_group->raise_to_top (); RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); @@ -2458,7 +2482,7 @@ Editor::start_region_brush_grab (ArdourCanvas::Item* item, GdkEvent* event, Regi { assert (region_view); assert (_drag == 0); - + if (Config->get_edit_mode() == Splice) { return; } @@ -2466,7 +2490,7 @@ Editor::start_region_brush_grab (ArdourCanvas::Item* item, GdkEvent* event, Regi RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); _drag = new RegionMoveDrag (this, item, region_view, s.by_layer(), true, false); _drag->start_grab (event); - + begin_reversible_command (_("Drag region brush")); } @@ -2491,7 +2515,7 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event) } /* XXX fix me one day to use all new regions */ - + boost::shared_ptr region (new_regions.front()); /* add it to the current stream/playlist. @@ -2500,11 +2524,11 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event) catch the signal it sends when it creates the regionview to set the regionview we want to then drag. */ - + latest_regionviews.clear(); sigc::connection c = clicked_routeview->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view)); - - /* A selection grab currently creates two undo/redo operations, one for + + /* A selection grab currently creates two undo/redo operations, one for creating the new region and another for moving it. */ @@ -2518,19 +2542,19 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event) session->add_command(new MementoCommand(*playlist, before, after)); commit_reversible_command (); - + c.disconnect (); - + if (latest_regionviews.empty()) { /* something went wrong */ return; } /* we need to deselect all other regionviews, and select this one - i'm ignoring undo stuff, because the region creation will take care of it + i'm ignoring undo stuff, because the region creation will take care of it */ selection->set (latest_regionviews); - + assert (_drag == 0); _drag = new RegionMoveDrag (this, latest_regionviews.front()->get_canvas_group(), latest_regionviews.front(), latest_regionviews, false, false); _drag->start_grab (event); @@ -2548,5 +2572,34 @@ 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 (); + + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + MidiTimeAxisView* mtv = dynamic_cast (*i); + if (mtv) { + mtv->start_step_editing (); + } + } + start_step_editing (); + + } else { + + mouse_select_button.set_image (*(manage (new Image (::get_icon("tool_range"))))); + mouse_select_button.get_image ()->show (); + stop_step_editing (); + + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + MidiTimeAxisView* mtv = dynamic_cast (*i); + if (mtv) { + mtv->stop_step_editing (); + } + } + } + set_canvas_cursor (); + + }