X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_mouse.cc;h=6a3eaa9084cc65b436dc963ce1c31a8887fd5a2a;hb=33e58df92c0b6731bdabe96f67bebad665c5d8da;hp=c39d5621658ff7c7648d932b75c8b962a01ae98e;hpb=11bd4eed89f79927f2f7d8cab50a60380cf9e49e;p=ardour.git diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index c39d562165..6a3eaa9084 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -31,6 +31,7 @@ #include #include "pbd/memento_command.h" #include "pbd/basename.h" +#include "pbd/stateful_diff_command.h" #include "ardour_ui.h" #include "actions.h" @@ -52,6 +53,7 @@ #include "rgb_macros.h" #include "control_point_dialog.h" #include "editor_drag.h" +#include "automation_region_view.h" #include "ardour/types.h" #include "ardour/profile.h" @@ -176,7 +178,7 @@ Editor::which_grabber_cursor () break; case MouseObject: - c = grabber_cursor; + c = grabber_note_cursor; break; case MouseTimeFX: @@ -323,30 +325,34 @@ Editor::mouse_mode_toggled (MouseMode m) mouse_mode = m; instant_save (); - - 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 (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { - (*i)->set_should_show_selection (true); - } - 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); - } - } + + cerr << "Mouse mode toggled to " << m << endl; + + 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 (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + (*i)->set_should_show_selection (true); + } + 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); + } + } + } set_canvas_cursor (); } @@ -422,6 +428,10 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp region alignment. note: not dbl-click or triple-click + + Also note that there is no region selection in internal edit mode, otherwise + for operations operating on the selection (e.g. cut) it is not obvious whether + to cut notes or regions. */ if (((mouse_mode != MouseObject) && @@ -430,8 +440,8 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp (mouse_mode != MouseTimeFX || item_type != RegionItem) && (mouse_mode != MouseGain) && (mouse_mode != MouseRange)) || - - ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3)) { + ((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3) || + internal_editing()) { return; } @@ -464,11 +474,12 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp if (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT && !selection->regions.empty()) { clicked_selection = select_range_around_region (selection->regions.front()); } - break; case RegionViewNameHighlight: case RegionViewName: + case LeftFrameHandle: + case RightFrameHandle: 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) { @@ -489,7 +500,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp break; case ControlPointItem: - set_selected_track_as_side_effect (); + set_selected_track_as_side_effect (true); if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) { set_selected_control_point_from_click (op, false); } @@ -498,7 +509,8 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp case StreamItem: /* for context click, select track */ if (event->button.button == 3) { - set_selected_track_as_side_effect (); + selection->clear_tracks (); + set_selected_track_as_side_effect (true); } break; @@ -514,10 +526,6 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp bool Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) { - if (_drags->active ()) { - _drags->abort (); - } - /* 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 @@ -616,6 +624,11 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT Editing::MouseMode eff = effective_mouse_mode (); + /* special case: allow drag of region fade in/out in object mode with join object/range enabled */ + if (item_type == FadeInHandleItem || item_type == FadeOutHandleItem) { + eff = MouseObject; + } + switch (eff) { case MouseRange: switch (item_type) { @@ -629,10 +642,10 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case SelectionItem: if (Keyboard::modifier_state_contains - (event->button.state, Keyboard::ModifierMask(Keyboard::SecondaryModifier))) { + (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier))) { // 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)) { + } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::SecondaryModifier)) { /* grab selection for moving */ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionMove), event); } else { @@ -652,8 +665,37 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT } break; + case NoteItem: + if (internal_editing()) { + /* trim notes if we're in internal edit mode and near the ends of the note */ + _drags->set (new NoteResizeDrag (this, item), event); + } + return true; + + case StreamItem: + if (internal_editing()) { + _drags->set (new RegionCreateDrag (this, item, clicked_axisview), event); + return true; + } else { + _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); + return true; + } + break; + + case RegionViewNameHighlight: + case LeftFrameHandle: + case RightFrameHandle: + { + RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); + _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event); + return true; + break; + } + default: - _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); + if (!internal_editing()) { + _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); + } } return true; break; @@ -662,7 +704,6 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT switch (item_type) { case NoteItem: if (internal_editing()) { - /* Note: we don't get here if not in internal_editing() mode */ _drags->set (new NoteDrag (this, item), event); return true; } @@ -682,27 +723,48 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT switch (item_type) { case FadeInHandleItem: { - RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); _drags->set (new FadeInDrag (this, item, reinterpret_cast (item->get_data("regionview")), s), event); return true; } case FadeOutHandleItem: { - RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); _drags->set (new FadeOutDrag (this, item, reinterpret_cast (item->get_data("regionview")), s), event); return true; } + 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; + } + case RegionItem: + if (dynamic_cast (clicked_regionview)) { + /* click on an automation region view; do nothing here and let the ARV's signal handler + sort it out. + */ + 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); - } else if (Keyboard::the_keyboard().key_is_down (GDK_b)) { + } + else if (Keyboard::the_keyboard().key_is_down (GDK_b)) { add_region_brush_drag (item, event, clicked_regionview); } else { add_region_drag (item, event, clicked_regionview); } - + if (_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)); } @@ -711,17 +773,19 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case RegionViewNameHighlight: - { - RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); - _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event); - return true; + case LeftFrameHandle: + case RightFrameHandle: + if (!internal_editing ()) { + RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); + _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event); + return true; + } break; - } case RegionViewName: { /* rename happens on edit clicks */ - RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); _drags->set (new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, s.by_layer()), event); return true; break; @@ -771,16 +835,19 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT if (rtv && _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) { boost::shared_ptr t = boost::dynamic_pointer_cast (rtv->route ()); if (t) { - boost::shared_ptr pl = t->diskstream()->playlist (); + boost::shared_ptr pl = t->playlist (); if (pl) { - boost::shared_ptr r = pl->top_region_at (unit_to_frame (event->button.x)); - RegionView* rv = rtv->view()->find_view (r); - clicked_selection = select_range_around_region (rv); - _drags->add (new SelectionDrag (this, item, SelectionDrag::SelectionMove)); - list rvs; - rvs.push_back (rv); - _drags->add (new RegionMoveDrag (this, item, rv, rvs, false, false)); - _drags->start_grab (event); + + boost::shared_ptr r = pl->top_region_at (event_frame (event)); + if (r) { + RegionView* rv = rtv->view()->find_view (r); + clicked_selection = select_range_around_region (rv); + _drags->add (new SelectionDrag (this, item, SelectionDrag::SelectionMove)); + list rvs; + rvs.push_back (rv); + _drags->add (new RegionMoveDrag (this, item, rv, rvs, false, false)); + _drags->start_grab (event); + } } } } @@ -880,9 +947,11 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case MouseTimeFX: if (internal_editing() && item_type == NoteItem) { + /* drag notes if we're in internal edit mode */ _drags->set (new NoteResizeDrag (this, item), event); return true; - } else if (!internal_editing() && item_type == RegionItem) { + } else if ((!internal_editing() || dynamic_cast (clicked_regionview)) && clicked_regionview) { + /* do time-FX if we're not in internal edit mode, or we are but we clicked on an audio region */ _drags->set (new TimeFXDrag (this, item, clicked_regionview, selection->regions.by_layer()), event); return true; } @@ -932,7 +1001,11 @@ Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemT switch (item_type) { case RegionViewNameHighlight: - _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event); + case LeftFrameHandle: + case RightFrameHandle: + if (!internal_editing ()) { + _drags->set (new TrimDrag (this, item, clicked_regionview, selection->regions.by_layer()), event); + } return true; break; @@ -988,9 +1061,6 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp 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; } } @@ -1043,7 +1113,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT return true; } - /* first, see if we're finishing a drag ... */ + /* see if we're finishing a drag */ bool were_dragging = false; if (_drags->active ()) { @@ -1056,8 +1126,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT were_dragging = true; } - button_selection (item, event, item_type); - /* edit events get handled here */ if (!_drags->active () && Keyboard::is_edit_event (&event->button)) { @@ -1114,6 +1182,8 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case RegionItem: case RegionViewNameHighlight: + case LeftFrameHandle: + case RightFrameHandle: case RegionViewName: popup_track_context_menu (1, event->button.time, item_type, false, where); break; @@ -1140,11 +1210,11 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case TempoMarkerItem: - tm_marker_context_menu (&event->button, item); + tempo_or_meter_marker_context_menu (&event->button, item); break; case MeterMarkerItem: - tm_marker_context_menu (&event->button, item); + tempo_or_meter_marker_context_menu (&event->button, item); break; case CrossfadeViewItem: @@ -1207,6 +1277,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT } break; + case NoteItem: + remove_midi_note (item, event); + break; + default: break; } @@ -1276,23 +1350,20 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case MouseGain: - // Gain only makes sense for audio regions - - if (!dynamic_cast(clicked_regionview)) { - break; - } - switch (item_type) { case RegionItem: + { /* check that we didn't drag before releasing, since its really annoying to create new control points when doing this. */ - if (were_dragging) { - dynamic_cast(clicked_regionview)->add_gain_point_event (item, event); + AudioRegionView* arv = dynamic_cast (clicked_regionview); + if (were_dragging && arv) { + arv->add_gain_point_event (item, event); } return true; break; + } case AutomationTrackItem: dynamic_cast(clicked_axisview)-> @@ -1379,6 +1450,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ ControlPoint* cp; Marker * marker; double fraction; + bool ret = true; if (last_item_entered != item) { last_item_entered = item; @@ -1437,11 +1509,23 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ break; case RegionViewNameHighlight: - if (is_drawable() && mouse_mode == MouseObject) { + if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) { track_canvas->get_window()->set_cursor (*trimmer_cursor); } break; + case LeftFrameHandle: + if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) { + track_canvas->get_window()->set_cursor (*left_side_trim_cursor); + } + break; + + case RightFrameHandle: + if (is_drawable() && mouse_mode == MouseObject && !internal_editing()) { + track_canvas->get_window()->set_cursor (*right_side_trim_cursor); + } + break; + case StartSelectionTrimItem: case EndSelectionTrimItem: @@ -1531,17 +1615,34 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ track_canvas->get_window()->set_cursor (*timebar_cursor); } break; + case FadeInHandleItem: + if (mouse_mode == MouseObject && !internal_editing()) { + ArdourCanvas::SimpleRect *rect = dynamic_cast (item); + if (rect) { + rect->property_fill_color_rgba() = 0; + rect->property_outline_pixels() = 1; + } + track_canvas->get_window()->set_cursor (*fade_in_cursor); + } + break; + case FadeOutHandleItem: - if (mouse_mode == MouseObject) { + if (mouse_mode == MouseObject && !internal_editing()) { ArdourCanvas::SimpleRect *rect = dynamic_cast (item); if (rect) { rect->property_fill_color_rgba() = 0; rect->property_outline_pixels() = 1; } + track_canvas->get_window()->set_cursor (*fade_out_cursor); + } + break; + case FeatureLineItem: + { + ArdourCanvas::SimpleLine *line = dynamic_cast (item); + line->property_color_rgba() = 0xFF0000FF; } break; - default: break; } @@ -1566,7 +1667,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ break; } - return false; + return ret; } bool @@ -1578,6 +1679,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ Location *loc; RegionView* rv; bool is_start; + bool ret = true; switch (item_type) { case ControlPointItem: @@ -1596,6 +1698,8 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ break; case RegionViewNameHighlight: + case LeftFrameHandle: + case RightFrameHandle: case StartSelectionTrimItem: case EndSelectionTrimItem: case PlayheadCursorItem: @@ -1673,6 +1777,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ rect->property_outline_pixels() = 0; } } + track_canvas->get_window()->set_cursor (*current_canvas_cursor); break; case AutomationTrackItem: @@ -1682,12 +1787,18 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ Glib::signal_idle().connect (sigc::mem_fun(*this, &Editor::left_automation_track)); } break; + case FeatureLineItem: + { + ArdourCanvas::SimpleLine *line = dynamic_cast (item); + line->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();; + } + break; default: break; } - return false; + return ret; } gint @@ -1818,7 +1929,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; } @@ -1916,7 +2027,7 @@ Editor::region_view_item_click (AudioRegionView& rv, GdkEventButton* event) RouteTimeAxisView* rtv = dynamic_cast(tv); double speed = 1.0; if (rtv && rtv->is_track()) { - speed = rtv->get_diskstream()->speed(); + speed = rtv->track()->speed(); } nframes64_t where = get_preferred_edit_position(); @@ -1980,7 +2091,7 @@ Editor::show_verbose_time_cursor (nframes64_t frame, double offset, double xpos, mins = frame / (frame_rate * 60); frame = frame % (frame_rate * 60); secs = (float) frame / (float) frame_rate; - snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%.4f", hours, mins, secs); + snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%07.4f", hours, mins, secs); break; default: @@ -1991,7 +2102,7 @@ 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 { - set_verbose_canvas_cursor (buf, _drags->current_pointer_x() + offset - horizontal_adjustment.get_value(), _drags->current_pointer_y() + offset - vertical_adjustment.get_value() + canvas_timebars_vsize); + set_verbose_canvas_cursor (buf, _drags->current_pointer_x() + offset - horizontal_position(), _drags->current_pointer_y() + offset - vertical_adjustment.get_value() + canvas_timebars_vsize); } show_verbose_canvas_cursor (); } @@ -2061,7 +2172,7 @@ Editor::show_verbose_duration_cursor (nframes64_t start, nframes64_t end, double mins = distance / (frame_rate * 60); distance = distance % (frame_rate * 60); secs = (float) distance / (float) frame_rate; - snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%.4f", hours, mins, secs); + snprintf (buf, sizeof (buf), "%02" PRId32 ":%02" PRId32 ":%07.4f", hours, mins, secs); break; default: @@ -2105,7 +2216,7 @@ Editor::cancel_selection () void -Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool swap_direction, bool obey_snap) +Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool swap_direction) { boost::shared_ptr region (rv.region()); @@ -2120,7 +2231,7 @@ Editor::single_contents_trim (RegionView& rv, nframes64_t frame_delta, bool left RouteTimeAxisView* tv = dynamic_cast(tvp); if (tv && tv->is_track()) { - speed = tv->get_diskstream()->speed(); + speed = tv->track()->speed(); } if (left_direction) { @@ -2137,15 +2248,12 @@ 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); - rv.region_changed (StartChanged); + rv.region_changed (PropertyChange (ARDOUR::Properties::start)); } void -Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool obey_snap, bool no_overlap) +Editor::single_start_trim (RegionView& rv, nframes64_t new_bound, bool no_overlap) { boost::shared_ptr region (rv.region()); @@ -2153,24 +2261,12 @@ Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_di return; } - nframes64_t new_bound; - double speed = 1.0; TimeAxisView* tvp = clicked_axisview; RouteTimeAxisView* tv = dynamic_cast(tvp); if (tv && tv->is_track()) { - speed = tv->get_diskstream()->speed(); - } - - if (left_direction) { - new_bound = (nframes64_t) (region->position()/speed) - frame_delta; - } else { - new_bound = (nframes64_t) (region->position()/speed) + frame_delta; - } - - if (obey_snap) { - snap_to (new_bound, (left_direction ? 0 : 1)); + speed = tv->track()->speed(); } nframes64_t pre_trim_first_frame = region->first_frame(); @@ -2196,11 +2292,11 @@ Editor::single_start_trim (RegionView& rv, nframes64_t frame_delta, bool left_di } } - rv.region_changed (Change (LengthChanged|PositionChanged|StartChanged)); + rv.region_changed (ARDOUR::bounds_change); } void -Editor::single_end_trim (RegionView& rv, nframes64_t frame_delta, bool left_direction, bool obey_snap, bool no_overlap) +Editor::single_end_trim (RegionView& rv, nframes64_t new_bound, bool no_overlap) { boost::shared_ptr region (rv.region()); @@ -2208,24 +2304,12 @@ Editor::single_end_trim (RegionView& rv, nframes64_t frame_delta, bool left_dire return; } - nframes64_t new_bound; - double speed = 1.0; TimeAxisView* tvp = clicked_axisview; RouteTimeAxisView* tv = dynamic_cast(tvp); if (tv && tv->is_track()) { - speed = tv->get_diskstream()->speed(); - } - - if (left_direction) { - new_bound = (nframes64_t) ((region->last_frame() + 1)/speed) - frame_delta; - } else { - new_bound = (nframes64_t) ((region->last_frame() + 1)/speed) + frame_delta; - } - - if (obey_snap) { - snap_to (new_bound); + speed = tv->track()->speed(); } nframes64_t pre_trim_last_frame = region->last_frame(); @@ -2239,8 +2323,8 @@ Editor::single_end_trim (RegionView& rv, nframes64_t frame_delta, bool left_dire bool regions_touching = false; - if (region_right != 0 && (pre_trim_last_frame == region_right->first_frame() - 1)){ - regions_touching = true; + if (region_right != 0 && (pre_trim_last_frame == region_right->first_frame() - 1)) { + regions_touching = true; } //Only trim region on the right if the last frame has gone beyond the right region's first frame. @@ -2250,10 +2334,10 @@ Editor::single_end_trim (RegionView& rv, nframes64_t frame_delta, bool left_dire region_right->trim_front(region->last_frame() + 1, this); } - rv.region_changed (Change (LengthChanged|PositionChanged|StartChanged)); - } - else { - rv.region_changed (LengthChanged); + rv.region_changed (ARDOUR::bounds_change); + + } else { + rv.region_changed (PropertyChange (ARDOUR::Properties::length)); } } @@ -2277,23 +2361,17 @@ Editor::point_trim (GdkEvent* event, nframes64_t new_bound) } if (!(*i)->region()->locked()) { - boost::shared_ptr pl = (*i)->region()->playlist(); - XMLNode &before = pl->get_state(); - + (*i)->region()->clear_history (); (*i)->region()->trim_front (new_bound, this); - - XMLNode &after = pl->get_state(); - _session->add_command(new MementoCommand(*pl.get(), &before, &after)); + _session->add_command(new StatefulDiffCommand ((*i)->region())); } } } else { if (!rv->region()->locked()) { - boost::shared_ptr pl = rv->region()->playlist(); - XMLNode &before = pl->get_state(); + rv->region()->clear_history (); rv->region()->trim_front (new_bound, this); - XMLNode &after = pl->get_state(); - _session->add_command(new MementoCommand(*pl.get(), &before, &after)); + _session->add_command(new StatefulDiffCommand (rv->region())); } } @@ -2308,22 +2386,18 @@ Editor::point_trim (GdkEvent* event, nframes64_t new_bound) for (list::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) { if (!(*i)->region()->locked()) { - boost::shared_ptr pl = (*i)->region()->playlist(); - XMLNode &before = pl->get_state(); + (*i)->region()->clear_history(); (*i)->region()->trim_end (new_bound, this); - XMLNode &after = pl->get_state(); - _session->add_command(new MementoCommand(*pl.get(), &before, &after)); + _session->add_command(new StatefulDiffCommand ((*i)->region())); } } } else { if (!rv->region()->locked()) { - boost::shared_ptr pl = rv->region()->playlist(); - XMLNode &before = pl->get_state(); + rv->region()->clear_history (); rv->region()->trim_end (new_bound, this); - XMLNode &after = pl->get_state(); - _session->add_command (new MementoCommand(*pl.get(), &before, &after)); + _session->add_command (new StatefulDiffCommand (rv->region())); } } @@ -2344,7 +2418,7 @@ Editor::thaw_region_after_trim (RegionView& rv) return; } - region->thaw (_("trimmed region")); + region->resume_property_changes (); AudioRegionView* arv = dynamic_cast(&rv); @@ -2441,16 +2515,16 @@ Editor::mouse_brush_insert_region (RegionView* rv, nframes64_t pos) } boost::shared_ptr playlist = rtv->playlist(); - double speed = rtv->get_diskstream()->speed(); + double speed = rtv->track()->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->clear_history (); + boost::shared_ptr new_region (RegionFactory::create (rv->region())); + playlist->add_region (new_region, (nframes64_t) (pos * speed)); + _session->add_command (new StatefulDiffCommand (playlist)); - // playlist is frozen, so we have to update manually + // playlist is frozen, so we have to update manually XXX this is disgusting - playlist->Modified(); /* EMIT SIGNAL */ + playlist->RegionAdded (new_region); /* EMIT SIGNAL */ } gint @@ -2473,12 +2547,10 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* if (Config->get_edit_mode() == Splice) { _drags->add (new RegionSpliceDrag (this, item, region_view, selection->regions.by_layer())); } else { - RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id); _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), false, false)); } - begin_reversible_command (_("move region(s)")); - /* sync the canvas to what we think is its current state */ update_canvas_now(); } @@ -2490,7 +2562,7 @@ Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionV _region_motion_group->raise_to_top (); - RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id); _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), false, true)); } @@ -2503,7 +2575,7 @@ Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent* event, Region return; } - RegionSelection s = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id); _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), true, false)); begin_reversible_command (_("Drag region brush")); @@ -2551,10 +2623,9 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event) boost::shared_ptr playlist = clicked_axisview->playlist(); - XMLNode *before = &(playlist->get_state()); + playlist->clear_history (); clicked_routeview->playlist()->add_region (region, selection->time[clicked_selection].start); - XMLNode *after = &(playlist->get_state()); - _session->add_command(new MementoCommand(*playlist, before, after)); + _session->add_command(new StatefulDiffCommand (playlist)); commit_reversible_command (); @@ -2577,7 +2648,7 @@ void Editor::escape () { if (_drags->active ()) { - _drags->break_drag (); + _drags->abort (); } else { selection->clear (); } @@ -2591,32 +2662,21 @@ Editor::set_internal_edit (bool 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()->tooltips().set_tip (mouse_select_button, _("Draw/Edit MIDI Notes")); + set_canvas_cursor (); - 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 (); + /* deselect everything to avoid confusion when e.g. we can't now cut a previously selected + region because cut means "cut note" rather than "cut region". + */ + selection->clear (); } 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 (); - } - } + ARDOUR_UI::instance()->tooltips().set_tip (mouse_select_button, _("Select/Move Ranges")); + mouse_mode_toggled (mouse_mode); // sets cursor } - - set_canvas_cursor (); - - } /** Update _join_object_range_state which indicate whether we are over the top or bottom half of a region view, @@ -2671,3 +2731,12 @@ Editor::effective_mouse_mode () const return mouse_mode; } + +void +Editor::remove_midi_note (ArdourCanvas::Item* item, GdkEvent *) +{ + ArdourCanvas::CanvasNoteEvent* e = dynamic_cast (item); + assert (e); + + e->region_view().delete_note (e->note ()); +}