X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_drag.cc;h=7d088d0684459bda31c6d4c4a443008c8681054d;hb=efab36a85e4a462716f2d7f4d0f12a12e45b4a75;hp=b4cfbf06ae3773b5f918078d252730687f3a8561;hpb=b85b4d9e54caef0585d308ef3bffee21d0e5ae56;p=ardour.git diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index b4cfbf06ae..7d088d0684 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -29,9 +29,13 @@ #include "gtkmm2ext/utils.h" -#include "ardour/session.h" +#include "ardour/audioregion.h" #include "ardour/dB.h" +#include "ardour/midi_region.h" +#include "ardour/operations.h" #include "ardour/region_factory.h" +#include "ardour/session.h" + #include "editor.h" #include "i18n.h" #include "keyboard.h" @@ -50,6 +54,9 @@ #include "midi_selection.h" #include "automation_time_axis.h" #include "debug.h" +#include "editor_cursors.h" +#include "mouse_cursors.h" +#include "verbose_cursor.h" using namespace std; using namespace ARDOUR; @@ -61,14 +68,13 @@ using namespace ArdourCanvas; using Gtkmm2ext::Keyboard; -double const ControlPointDrag::_zero_gain_fraction = gain_to_slider_position (dB_to_coefficient (0.0)); +double ControlPointDrag::_zero_gain_fraction = -1.0; DragManager::DragManager (Editor* e) : _editor (e) , _ending (false) , _current_pointer_frame (0) { - } DragManager::~DragManager () @@ -81,12 +87,16 @@ void DragManager::abort () { _ending = true; - + for (list::const_iterator i = _drags.begin(); i != _drags.end(); ++i) { (*i)->abort (); delete *i; } + if (!_drags.empty ()) { + _editor->set_follow_playhead (_old_follow_playhead, false); + } + _drags.clear (); _ending = false; @@ -110,8 +120,12 @@ DragManager::set (Drag* d, GdkEvent* e, Gdk::Cursor* c) void DragManager::start_grab (GdkEvent* e, Gdk::Cursor* c) { + /* Prevent follow playhead during the drag to be nice to the user */ + _old_follow_playhead = _editor->follow_playhead (); + _editor->set_follow_playhead (false); + _current_pointer_frame = _editor->event_frame (e, &_current_pointer_x, &_current_pointer_y); - + for (list::const_iterator i = _drags.begin(); i != _drags.end(); ++i) { (*i)->start_grab (e, c); } @@ -124,7 +138,7 @@ bool DragManager::end_grab (GdkEvent* e) { _ending = true; - + bool r = false; for (list::iterator i = _drags.begin(); i != _drags.end(); ++i) { bool const t = (*i)->end_grab (e); @@ -137,7 +151,9 @@ DragManager::end_grab (GdkEvent* e) _drags.clear (); _ending = false; - + + _editor->set_follow_playhead (_old_follow_playhead, false); + return r; } @@ -147,13 +163,13 @@ DragManager::motion_handler (GdkEvent* e, bool from_autoscroll) bool r = false; _current_pointer_frame = _editor->event_frame (e, &_current_pointer_x, &_current_pointer_y); - + for (list::iterator i = _drags.begin(); i != _drags.end(); ++i) { bool const t = (*i)->motion_handler (e, from_autoscroll); if (t) { r = true; } - + } return r; @@ -170,7 +186,7 @@ DragManager::have_item (ArdourCanvas::Item* i) const return j != _drags.end (); } -Drag::Drag (Editor* e, ArdourCanvas::Item* i) +Drag::Drag (Editor* e, ArdourCanvas::Item* i) : _editor (e) , _item (i) , _pointer_frame_offset (0) @@ -218,14 +234,15 @@ Drag::start_grab (GdkEvent* event, Gdk::Cursor *cursor) } _raw_grab_frame = _editor->event_frame (event, &_grab_x, &_grab_y); + setup_pointer_frame_offset (); _grab_frame = adjusted_frame (_raw_grab_frame, event); _last_pointer_frame = _grab_frame; _last_pointer_x = _grab_x; _last_pointer_y = _grab_y; _item->grab (Gdk::POINTER_MOTION_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK, - *cursor, - event->button.time); + *cursor, + event->button.time); if (_editor->session() && _editor->session()->transport_rolling()) { _was_rolling = true; @@ -260,7 +277,7 @@ Drag::end_grab (GdkEvent* event) finished (event, _move_threshold_passed); - _editor->hide_verbose_canvas_cursor(); + _editor->verbose_cursor()->hide (); return _move_threshold_passed; } @@ -291,8 +308,9 @@ bool Drag::motion_handler (GdkEvent* event, bool from_autoscroll) { /* check to see if we have moved in any way that matters since the last motion event */ - if ( (!x_movement_matters() || _last_pointer_frame == adjusted_current_frame (event)) && - (!y_movement_matters() || _last_pointer_y == _drags->current_pointer_y ()) ) { + if (_move_threshold_passed && + (!x_movement_matters() || _last_pointer_frame == adjusted_current_frame (event)) && + (!y_movement_matters() || _last_pointer_y == _drags->current_pointer_y ()) ) { return false; } @@ -302,7 +320,7 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll) if (!from_autoscroll && !_move_threshold_passed) { - bool const xp = (::llabs (adjusted_current_frame (event) - _grab_frame) >= threshold.first); + bool const xp = (::llabs (_drags->current_pointer_frame () - _raw_grab_frame) >= threshold.first); bool const yp = (::fabs ((_drags->current_pointer_y () - _grab_y)) >= threshold.second); _move_threshold_passed = ((xp && x_movement_matters()) || (yp && y_movement_matters())); @@ -320,7 +338,7 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll) _last_pointer_x = _drags->current_pointer_x (); _last_pointer_y = _drags->current_pointer_y (); _last_pointer_frame = adjusted_current_frame (event); - + return true; } } @@ -335,12 +353,49 @@ Drag::abort () _item->ungrab (0); } - aborted (); + aborted (_move_threshold_passed); _editor->stop_canvas_autoscroll (); - _editor->hide_verbose_canvas_cursor (); + _editor->verbose_cursor()->hide (); +} + +void +Drag::show_verbose_cursor_time (framepos_t frame) +{ + _editor->verbose_cursor()->set_time ( + frame, + _drags->current_pointer_x() + 10 - _editor->horizontal_position(), + _drags->current_pointer_y() + 10 - _editor->vertical_adjustment.get_value() + _editor->canvas_timebars_vsize + ); + + _editor->verbose_cursor()->show (); +} + +void +Drag::show_verbose_cursor_duration (framepos_t start, framepos_t end, double xoffset) +{ + _editor->verbose_cursor()->show (xoffset); + + _editor->verbose_cursor()->set_duration ( + start, end, + _drags->current_pointer_x() + 10 - _editor->horizontal_position(), + _drags->current_pointer_y() + 10 - _editor->vertical_adjustment.get_value() + _editor->canvas_timebars_vsize + ); } +void +Drag::show_verbose_cursor_text (string const & text) +{ + _editor->verbose_cursor()->show (); + + _editor->verbose_cursor()->set ( + text, + _drags->current_pointer_x() + 10 - _editor->horizontal_position(), + _drags->current_pointer_y() + 10 - _editor->vertical_adjustment.get_value() + _editor->canvas_timebars_vsize + ); +} + + struct EditorOrderTimeAxisViewSorter { bool operator() (TimeAxisView* a, TimeAxisView* b) { RouteTimeAxisView* ra = dynamic_cast (a); @@ -356,30 +411,29 @@ RegionDrag::RegionDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, listvisible_order_range (&_visible_y_low, &_visible_y_high); - /* Make a list of non-hidden tracks to refer to during the drag */ + /* Make a list of tracks to refer to during the drag; we include hidden tracks, + as some of the regions we are dragging may be on such tracks. + */ TrackViewList track_views = _editor->track_views; track_views.sort (EditorOrderTimeAxisViewSorter ()); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { - if (!(*i)->hidden()) { - - _time_axis_views.push_back (*i); - - TimeAxisView::Children children_list = (*i)->get_child_list (); - for (TimeAxisView::Children::iterator j = children_list.begin(); j != children_list.end(); ++j) { - _time_axis_views.push_back (j->get()); - } + _time_axis_views.push_back (*i); + + TimeAxisView::Children children_list = (*i)->get_child_list (); + for (TimeAxisView::Children::iterator j = children_list.begin(); j != children_list.end(); ++j) { + _time_axis_views.push_back (j->get()); } } - /* the list of views can be empty at this point if this is a region list-insert drag - */ - + /* the list of views can be empty at this point if this is a region list-insert drag + */ + for (list::const_iterator i = v.begin(); i != v.end(); ++i) { _views.push_back (DraggingView (*i, this)); } - + RegionView::RegionViewGoingAway.connect (death_connection, invalidator (*this), ui_bind (&RegionDrag::region_going_away, this, _1), gui_context()); } @@ -396,7 +450,9 @@ RegionDrag::region_going_away (RegionView* v) } } -/** Given a non-hidden TimeAxisView, return the index of it into the _time_axis_views vector */ +/** Given a TimeAxisView, return the index of it into the _time_axis_views vector, + * or -1 if it is not found. + */ int RegionDrag::find_time_axis_view (TimeAxisView* t) const { @@ -409,7 +465,7 @@ RegionDrag::find_time_axis_view (TimeAxisView* t) const if (i == N) { return -1; } - + return i; } @@ -427,9 +483,9 @@ RegionMotionDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) { Drag::start_grab (event, cursor); - _editor->show_verbose_time_cursor (_last_frame_position, 10); + show_verbose_cursor_time (_last_frame_position); - pair const tv = _editor->trackview_by_y_position (_drags->current_pointer_y ()); + pair const tv = _editor->trackview_by_y_position (_drags->current_pointer_y ()); _last_pointer_time_axis_view = find_time_axis_view (tv.first); _last_pointer_layer = tv.first->layer_display() == Overlaid ? 0 : tv.second; } @@ -445,19 +501,19 @@ RegionMotionDrag::compute_x_delta (GdkEvent const * event, framepos_t* pending_r framepos_t sync_frame; framecnt_t sync_offset; int32_t sync_dir; - + sync_offset = _primary->region()->sync_offset (sync_dir); - + /* we don't handle a sync point that lies before zero. */ if (sync_dir >= 0 || (sync_dir < 0 && *pending_region_position >= sync_offset)) { - + sync_frame = *pending_region_position + (sync_dir*sync_offset); - + _editor->snap_to_with_modifier (sync_frame, event); - + *pending_region_position = _primary->region()->adjust_to_sync (sync_frame); - + } else { *pending_region_position = _last_frame_position; } @@ -473,13 +529,13 @@ RegionMotionDrag::compute_x_delta (GdkEvent const * event, framepos_t* pending_r if ((*pending_region_position != _last_frame_position) && x_move_allowed) { - /* x movement since last time */ + /* x movement since last time (in pixels) */ dx = (static_cast (*pending_region_position) - _last_frame_position) / _editor->frames_per_unit; /* total x movement */ framecnt_t total_dx = *pending_region_position; if (regions_came_from_canvas()) { - total_dx = total_dx - grab_frame () + _pointer_frame_offset; + total_dx = total_dx - grab_frame (); } /* check that no regions have gone off the start of the session */ @@ -498,7 +554,7 @@ RegionMotionDrag::compute_x_delta (GdkEvent const * event, framepos_t* pending_r } bool -RegionMotionDrag::y_movement_allowed (int delta_track, layer_t delta_layer) const +RegionMotionDrag::y_movement_allowed (int delta_track, double delta_layer) const { for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { int const n = i->time_axis_view + delta_track; @@ -512,9 +568,13 @@ RegionMotionDrag::y_movement_allowed (int delta_track, layer_t delta_layer) cons /* not a track, or the wrong type */ return false; } - - int const l = i->layer + delta_layer; - if (delta_track == 0 && (l < 0 || l >= int (to->view()->layers()))) { + + double const l = i->layer + delta_layer; + + /* Note that we allow layer to be up to 0.5 below zero, as this is used by `Expanded' + mode to allow the user to place a region below another on layer 0. + */ + if (delta_track == 0 && (l < -0.5 || l >= int (to->view()->layers()))) { /* Off the top or bottom layer; note that we only refuse if the track hasn't changed. If it has, the layers will be munged later anyway, so it's ok. */ @@ -532,12 +592,16 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) assert (!_views.empty ()); /* Find the TimeAxisView that the pointer is now over */ - pair const tv = _editor->trackview_by_y_position (_drags->current_pointer_y ()); + pair const tv = _editor->trackview_by_y_position (_drags->current_pointer_y ()); + + if (first_move && tv.first->view()->layer_display() == Stacked) { + tv.first->view()->set_layer_display (Expanded); + } /* Bail early if we're not over a track */ RouteTimeAxisView* rtv = dynamic_cast (tv.first); if (!rtv || !rtv->is_track()) { - _editor->hide_verbose_canvas_cursor (); + _editor->verbose_cursor()->hide (); return; } @@ -545,7 +609,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) /* Here's the current pointer position in terms of time axis view and layer */ int const current_pointer_time_axis_view = find_time_axis_view (tv.first); - layer_t const current_pointer_layer = tv.first->layer_display() == Overlaid ? 0 : tv.second; + double const current_pointer_layer = tv.first->layer_display() == Overlaid ? 0 : tv.second; /* Work out the change in x */ framepos_t pending_region_position; @@ -553,7 +617,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) /* Work out the change in y */ int delta_time_axis_view = current_pointer_time_axis_view - _last_pointer_time_axis_view; - int delta_layer = current_pointer_layer - _last_pointer_layer; + double delta_layer = current_pointer_layer - _last_pointer_layer; if (!y_movement_allowed (delta_time_axis_view, delta_layer)) { /* this y movement is not allowed, so do no y movement this time */ @@ -580,86 +644,59 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) if (first_move) { - /* here we are calculating the y distance from the - top of the first track view to the top of the region - area of the track view that we're working on */ - - /* this x value is just a dummy value so that we have something - to pass to i2w () */ - - double ix1 = 0; - - /* distance from the top of this track view to the region area - of our track view is always 1 */ - - double iy1 = 1; - - /* convert to world coordinates, ie distance from the top of - the ruler section */ - - rv->get_canvas_frame()->i2w (ix1, iy1); - - /* compensate for the ruler section and the vertical scrollbar position */ - iy1 += _editor->get_trackview_group_vertical_offset (); - - // hide any dependent views - rv->get_time_axis_view().hide_dependent_views (*rv); - - /* - reparent to a non scrolling group so that we can keep the - region selection above all time axis views. - reparenting means we have to move the rv as the two - parent groups have different coordinates. + + /* Absolutely no idea why this is necessary, but it is; without + it, the region view disappears after the reparent. */ + _editor->update_canvas_now (); - rv->get_canvas_group()->property_y() = iy1 - 1; + /* Reparent to a non scrolling group so that we can keep the + region selection above all time axis views. + Reparenting means that we will have to move the region view + later, as the two parent groups have different coordinates. + */ + rv->get_canvas_group()->reparent (*(_editor->_region_motion_group)); rv->fake_set_opaque (true); } - /* Work out the change in y position of this region view */ - - double y_delta = 0; - /* If we have moved tracks, we'll fudge the layer delta so that the region gets moved back onto layer 0 on its new track; this avoids confusion when dragging regions from non-zero layers onto different tracks. */ - int this_delta_layer = delta_layer; + double this_delta_layer = delta_layer; if (delta_time_axis_view != 0) { this_delta_layer = - i->layer; } - /* Move this region to layer 0 on its old track */ - StreamView* lv = _time_axis_views[i->time_axis_view]->view (); - if (lv->layer_display() == Stacked) { - y_delta -= (lv->layers() - i->layer - 1) * lv->child_height (); + /* The TimeAxisView that this region is now on */ + TimeAxisView* tv = _time_axis_views[i->time_axis_view + delta_time_axis_view]; + + /* Ensure it is moved from stacked -> expanded if appropriate */ + if (tv->view()->layer_display() == Stacked) { + tv->view()->set_layer_display (Expanded); } - /* Now move it to its right layer on the current track */ - StreamView* cv = _time_axis_views[i->time_axis_view + delta_time_axis_view]->view (); - if (cv->layer_display() == Stacked) { - y_delta += (cv->layers() - (i->layer + this_delta_layer) - 1) * cv->child_height (); + /* We're only allowed to go -ve in layer on Expanded views */ + if (tv->view()->layer_display() != Expanded && (i->layer + this_delta_layer) < 0) { + this_delta_layer = - i->layer; } + + /* Set height */ + rv->set_height (tv->view()->child_height ()); - /* Move tracks */ - if (delta_time_axis_view > 0) { - for (int j = 0; j < delta_time_axis_view; ++j) { - y_delta += _time_axis_views[i->time_axis_view + j]->current_height (); - } + /* Update show/hidden status as the region view may have come from a hidden track, + or have moved to one. + */ + if (tv->hidden ()) { + rv->get_canvas_group()->hide (); } else { - /* start by subtracting the height of the track above where we are now */ - for (int j = 1; j <= -delta_time_axis_view; ++j) { - y_delta -= _time_axis_views[i->time_axis_view - j]->current_height (); - } + rv->get_canvas_group()->show (); } - /* Set height */ - rv->set_height (_time_axis_views[i->time_axis_view + delta_time_axis_view]->view()->child_height ()); - /* Update the DraggingView */ i->time_axis_view += delta_time_axis_view; i->layer += this_delta_layer; @@ -667,19 +704,40 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move) if (_brushing) { _editor->mouse_brush_insert_region (rv, pending_region_position); } else { - rv->move (x_delta, y_delta); + double x = 0; + double y = 0; + + /* Get the y coordinate of the top of the track that this region is now on */ + tv->canvas_display()->i2w (x, y); + y += _editor->get_trackview_group_vertical_offset(); + + /* And adjust for the layer that it should be on */ + StreamView* cv = tv->view (); + switch (cv->layer_display ()) { + case Overlaid: + break; + case Stacked: + y += (cv->layers() - i->layer - 1) * cv->child_height (); + break; + case Expanded: + y += (cv->layers() - i->layer - 0.5) * 2 * cv->child_height (); + break; + } + + /* Now move the region view */ + rv->move (x_delta, y - rv->get_canvas_group()->property_y()); } } /* foreach region */ _total_x_delta += x_delta; - + if (first_move) { _editor->cursor_group->raise_to_top(); } if (x_delta != 0 && !_brushing) { - _editor->show_verbose_time_cursor (_last_frame_position, 10); + show_verbose_cursor_time (_last_frame_position); } _last_pointer_time_axis_view += delta_time_axis_view; @@ -696,20 +754,20 @@ RegionMoveDrag::motion (GdkEvent* event, bool first_move) list new_regionviews; for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { - + RegionView* rv = i->view; AudioRegionView* arv = dynamic_cast(rv); MidiRegionView* mrv = dynamic_cast(rv); const boost::shared_ptr original = rv->region(); boost::shared_ptr region_copy = RegionFactory::create (original, true); - region_copy->set_position (original->position(), this); - + region_copy->set_position (original->position()); + RegionView* nrv; if (arv) { boost::shared_ptr audioregion_copy = boost::dynamic_pointer_cast(region_copy); - + nrv = new AudioRegionView (*arv, audioregion_copy); } else if (mrv) { boost::shared_ptr midiregion_copy @@ -718,29 +776,29 @@ RegionMoveDrag::motion (GdkEvent* event, bool first_move) } else { continue; } - + nrv->get_canvas_group()->show (); new_regionviews.push_back (DraggingView (nrv, this)); - + /* swap _primary to the copy */ - + if (rv == _primary) { _primary = nrv; } - + /* ..and deselect the one we copied */ - + rv->set_selected (false); } - + if (!new_regionviews.empty()) { - + /* reflect the fact that we are dragging the copies */ - + _views = new_regionviews; - + swap_grab (new_regionviews.front().view->get_canvas_group (), 0, event ? event->motion.time : 0); - + /* sync the canvas to what we think is its current state without it, the canvas seems to @@ -756,8 +814,24 @@ RegionMoveDrag::motion (GdkEvent* event, bool first_move) } void -RegionMoveDrag::finished (GdkEvent *, bool movement_occurred) +RegionMotionDrag::finished (GdkEvent *, bool) { + for (vector::iterator i = _time_axis_views.begin(); i != _time_axis_views.end(); ++i) { + if (!(*i)->view()) { + continue; + } + + if ((*i)->view()->layer_display() == Expanded) { + (*i)->view()->set_layer_display (Stacked); + } + } +} + +void +RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred) +{ + RegionMotionDrag::finished (ev, movement_occurred); + if (!movement_occurred) { /* just a click */ return; @@ -773,28 +847,36 @@ RegionMoveDrag::finished (GdkEvent *, bool movement_occurred) assert (!_views.empty ()); + /* We might have hidden region views so that they weren't visible during the drag + (when they have been reparented). Now everything can be shown again, as region + views are back in their track parent groups. + */ + for (list::iterator i = _views.begin(); i != _views.end(); ++i) { + i->view->get_canvas_group()->show (); + } + bool const changed_position = (_last_frame_position != _primary->region()->position()); bool const changed_tracks = (_time_axis_views[_views.front().time_axis_view] != &_views.front().view->get_time_axis_view()); framecnt_t const drag_delta = _primary->region()->position() - _last_frame_position; - - _editor->update_canvas_now (); + _editor->update_canvas_now (); + if (_copy) { - + finished_copy ( changed_position, changed_tracks, drag_delta ); - + } else { - + finished_no_copy ( changed_position, changed_tracks, drag_delta ); - + } } @@ -817,9 +899,9 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed } if (_x_constrained) { - _editor->begin_reversible_command (_("fixed time region copy")); + _editor->begin_reversible_command (Operations::fixed_time_region_copy); } else { - _editor->begin_reversible_command (_("region copy")); + _editor->begin_reversible_command (Operations::region_copy); } /* insert the regions into their new playlists */ @@ -840,13 +922,13 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed RegionView* new_view = insert_region_into_playlist ( i->view->region(), dynamic_cast (_time_axis_views[i->time_axis_view]), i->layer, where, modified_playlists ); - + if (new_view == 0) { continue; } new_views.push_back (new_view); - + /* we don't need the copied RegionView any more */ views_to_delete.push_back (i->view); } @@ -859,8 +941,8 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed delete *i; } - /* If we've created new regions either by copying or moving - to a new track, we want to replace the old selection with the new ones + /* If we've created new regions either by copying or moving + to a new track, we want to replace the old selection with the new ones */ if (new_views.size() > 0) { @@ -883,6 +965,7 @@ RegionMoveDrag::finished_no_copy ( RegionSelection new_views; PlaylistSet modified_playlists; PlaylistSet frozen_playlists; + set views_to_update; if (_brushing) { /* all changes were made during motion event handlers */ @@ -893,7 +976,7 @@ RegionMoveDrag::finished_no_copy ( if (_x_constrained) { _editor->begin_reversible_command (_("fixed time region drag")); } else { - _editor->begin_reversible_command (_("region drag")); + _editor->begin_reversible_command (Operations::region_drag); } for (list::const_iterator i = _views.begin(); i != _views.end(); ) { @@ -901,13 +984,15 @@ RegionMoveDrag::finished_no_copy ( RegionView* rv = i->view; RouteTimeAxisView* const dest_rtv = dynamic_cast (_time_axis_views[i->time_axis_view]); - layer_t const dest_layer = i->layer; + double const dest_layer = i->layer; if (rv->region()->locked()) { ++i; continue; } + views_to_update.insert (dest_rtv); + framepos_t where; if (changed_position && !_x_constrained) { @@ -944,7 +1029,7 @@ RegionMoveDrag::finished_no_copy ( remove_region_from_playlist (rv->region(), i->initial_playlist, modified_playlists); } else { - + rv->region()->clear_changes (); /* @@ -960,12 +1045,11 @@ RegionMoveDrag::finished_no_copy ( /* just change the model */ boost::shared_ptr playlist = dest_rtv->playlist(); - - if (dest_rtv->view()->layer_display() == Stacked) { - rv->region()->set_layer (dest_layer); - rv->region()->set_pending_explicit_relayer (true); + + if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) { + playlist->set_layer (rv->region(), dest_layer); } - + /* freeze playlist to avoid lots of relayering in the case of a multi-region drag */ pair r = frozen_playlists.insert (playlist); @@ -977,19 +1061,19 @@ RegionMoveDrag::finished_no_copy ( /* this movement may result in a crossfade being modified, so we need to get undo data from the playlist as well as the region. */ - + r = modified_playlists.insert (playlist); if (r.second) { playlist->clear_changes (); } - rv->region()->set_position (where, (void*) this); + rv->region()->set_position (where); _editor->session()->add_command (new StatefulDiffCommand (rv->region())); } if (changed_tracks) { - + /* OK, this is where it gets tricky. If the playlist was being used by >1 tracks, and the region was selected in all of them, then removing it from a playlist will have removed all trace of it from _views (i.e. there were N regions selected, we removed 1, @@ -1007,9 +1091,9 @@ RegionMoveDrag::finished_no_copy ( we can just iterate. */ - + if (_views.empty()) { - break; + break; } else { i = _views.begin(); } @@ -1019,8 +1103,8 @@ RegionMoveDrag::finished_no_copy ( } } - /* If we've created new regions either by copying or moving - to a new track, we want to replace the old selection with the new ones + /* If we've created new regions either by copying or moving + to a new track, we want to replace the old selection with the new ones */ if (new_views.size() > 0) { @@ -1035,6 +1119,17 @@ RegionMoveDrag::finished_no_copy ( add_stateful_diff_commands_for_playlists (modified_playlists); _editor->commit_reversible_command (); + + /* We have futzed with the layering of canvas items on our streamviews. + If any region changed layer, this will have resulted in the stream + views being asked to set up their region views, and all will be well. + If not, we might now have badly-ordered region views. Ask the StreamViews + involved to sort themselves out, just in case. + */ + + for (set::iterator i = views_to_update.begin(); i != views_to_update.end(); ++i) { + (*i)->view()->playlist_layered ((*i)->track ()); + } } /** Remove a region from a playlist, clearing the diff history of the playlist first if necessary. @@ -1058,7 +1153,7 @@ RegionMoveDrag::remove_region_from_playlist ( playlist->remove_region (region); } - + /** Insert a region into a playlist, handling the recovery of the resulting new RegionView, and * clearing the playlist's diff history first if necessary. @@ -1067,7 +1162,7 @@ RegionMoveDrag::remove_region_from_playlist ( * @param dest_layer Destination layer. * @param where Destination position. * @param modified_playlists The playlist will be added to this if it is not there already; used to ensure - * that clear_changes () is only called once per playlist. + * that clear_changes () is only called once per playlist. * @return New RegionView, or 0 if no insert was performed. */ RegionView * @@ -1088,7 +1183,7 @@ RegionMoveDrag::insert_region_into_playlist ( _new_region_view = 0; sigc::connection c = dest_rtv->view()->RegionViewAdded.connect (sigc::mem_fun (*this, &RegionMoveDrag::collect_new_region_view)); - /* clear history for the playlist we are about to insert to, provided we haven't already done so */ + /* clear history for the playlist we are about to insert to, provided we haven't already done so */ pair r = modified_playlists.insert (dest_playlist); if (r.second) { dest_playlist->clear_changes (); @@ -1096,9 +1191,8 @@ RegionMoveDrag::insert_region_into_playlist ( dest_playlist->add_region (region, where); - if (dest_rtv->view()->layer_display() == Stacked) { - region->set_layer (dest_layer); - region->set_pending_explicit_relayer (true); + if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) { + dest_playlist->set_layer (region, dest_layer); } c.disconnect (); @@ -1120,7 +1214,7 @@ RegionMoveDrag::add_stateful_diff_commands_for_playlists (PlaylistSet const & pl for (PlaylistSet::const_iterator i = playlists.begin(); i != playlists.end(); ++i) { StatefulDiffCommand* c = new StatefulDiffCommand (*i); if (!c->empty()) { - _editor->session()->add_command (new StatefulDiffCommand (*i)); + _editor->session()->add_command (c); } else { delete c; } @@ -1129,7 +1223,7 @@ RegionMoveDrag::add_stateful_diff_commands_for_playlists (PlaylistSet const & pl void -RegionMoveDrag::aborted () +RegionMoveDrag::aborted (bool movement_occurred) { if (_copy) { @@ -1140,13 +1234,19 @@ RegionMoveDrag::aborted () _views.clear (); } else { - RegionMotionDrag::aborted (); + RegionMotionDrag::aborted (movement_occurred); } } void -RegionMotionDrag::aborted () +RegionMotionDrag::aborted (bool) { + for (vector::iterator i = _time_axis_views.begin(); i != _time_axis_views.end(); ++i) { + if ((*i)->view()->layer_display() == Expanded) { + (*i)->view()->set_layer_display (Stacked); + } + } + for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { RegionView* rv = i->view; TimeAxisView* tv = &(rv->get_time_axis_view ()); @@ -1162,13 +1262,16 @@ RegionMotionDrag::aborted () _editor->update_canvas_now (); } - + +/** @param b true to brush, otherwise false. + * @param c true to make copies of the regions being moved, otherwise false. + */ RegionMoveDrag::RegionMoveDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list const & v, bool b, bool c) : RegionMotionDrag (e, i, p, v, b), _copy (c) { DEBUG_TRACE (DEBUG::Drags, "New RegionMoveDrag\n"); - + double speed = 1; RouteTimeAxisView* rtv = dynamic_cast (&_primary->get_time_axis_view ()); if (rtv && rtv->is_track()) { @@ -1179,10 +1282,8 @@ RegionMoveDrag::RegionMoveDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, } void -RegionMoveDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) +RegionMoveDrag::setup_pointer_frame_offset () { - RegionMotionDrag::start_grab (event, c); - _pointer_frame_offset = raw_grab_frame() - _last_frame_position; } @@ -1190,7 +1291,7 @@ RegionInsertDrag::RegionInsertDrag (Editor* e, boost::shared_ptr r, Rout : RegionMotionDrag (e, 0, 0, list (), false) { DEBUG_TRACE (DEBUG::Drags, "New RegionInsertDrag\n"); - + assert ((boost::dynamic_pointer_cast (r) && dynamic_cast (v)) || (boost::dynamic_pointer_cast (r) && dynamic_cast (v))); @@ -1217,8 +1318,8 @@ RegionInsertDrag::finished (GdkEvent *, bool) boost::shared_ptr playlist = dest_rtv->playlist(); - _editor->begin_reversible_command (_("insert region")); - playlist->clear_changes (); + _editor->begin_reversible_command (Operations::insert_region); + playlist->clear_changes (); playlist->add_region (_primary->region (), _last_frame_position); _editor->session()->add_command (new StatefulDiffCommand (playlist)); _editor->commit_reversible_command (); @@ -1229,7 +1330,7 @@ RegionInsertDrag::finished (GdkEvent *, bool) } void -RegionInsertDrag::aborted () +RegionInsertDrag::aborted (bool) { delete _primary; _primary = 0; @@ -1253,13 +1354,8 @@ RegionSpliceDrag::motion (GdkEvent* event, bool) { /* Which trackview is this ? */ - pair const tvp = _editor->trackview_by_y_position (_drags->current_pointer_y ()); + pair const tvp = _editor->trackview_by_y_position (_drags->current_pointer_y ()); RouteTimeAxisView* tv = dynamic_cast (tvp.first); - layer_t layer = tvp.second; - - if (tv && tv->layer_display() == Overlaid) { - layer = 0; - } /* The region motion is only processed if the pointer is over an audio track. @@ -1269,7 +1365,7 @@ RegionSpliceDrag::motion (GdkEvent* event, bool) /* To make sure we hide the verbose canvas cursor when the mouse is not held over and audiotrack. */ - _editor->hide_verbose_canvas_cursor (); + _editor->verbose_cursor()->hide (); return; } @@ -1328,7 +1424,7 @@ RegionSpliceDrag::finished (GdkEvent* event, bool movement_occurred) } void -RegionSpliceDrag::aborted () +RegionSpliceDrag::aborted (bool) { /* XXX: TODO */ } @@ -1338,7 +1434,7 @@ RegionCreateDrag::RegionCreateDrag (Editor* e, ArdourCanvas::Item* i, TimeAxisVi _view (dynamic_cast (v)) { DEBUG_TRACE (DEBUG::Drags, "New RegionCreateDrag\n"); - + assert (_view); } @@ -1346,51 +1442,64 @@ void RegionCreateDrag::motion (GdkEvent* event, bool first_move) { if (first_move) { - add_region(); + add_region(); + _view->playlist()->freeze (); } else { - if (_region) { - framepos_t const f = adjusted_current_frame (event); - if (f < grab_frame()) { - _region->set_position (f, this); - } - - /* again, don't use a zero-length region (see above) */ - framecnt_t const len = abs (f - grab_frame ()); - _region->set_length (len < 1 ? 1 : len, this); - } - } + if (_region) { + framepos_t const f = adjusted_current_frame (event); + if (f < grab_frame()) { + _region->set_position (f); + } + + /* Don't use a zero-length region, and subtract 1 frame from the snapped length + so that if this region is duplicated, its duplicate starts on + a snap point rather than 1 frame after a snap point. Otherwise things get + a bit confusing as if a region starts 1 frame after a snap point, one cannot + place snapped notes at the start of the region. + */ + + framecnt_t const len = abs (f - grab_frame () - 1); + _region->set_length (len < 1 ? 1 : len); + } + } } void RegionCreateDrag::finished (GdkEvent*, bool movement_occurred) { if (!movement_occurred) { - add_region (); + add_region (); + } else { + _view->playlist()->thaw (); } - if (_region) { - _editor->commit_reversible_command (); - } + if (_region) { + _editor->commit_reversible_command (); + } } void RegionCreateDrag::add_region () { - if (_editor->session()) { - const TempoMap& map (_editor->session()->tempo_map()); - framecnt_t pos = grab_frame(); - const Meter& m = map.meter_at (pos); - /* not that the frame rate used here can be affected by pull up/down which - might be wrong. - */ - framecnt_t len = m.frames_per_bar (map.tempo_at (pos), _editor->session()->frame_rate()); - _region = _view->add_region (grab_frame(), len, false); - } + if (_editor->session()) { + const TempoMap& map (_editor->session()->tempo_map()); + framecnt_t pos = grab_frame(); + const Meter& m = map.meter_at (pos); + /* not that the frame rate used here can be affected by pull up/down which + might be wrong. + */ + framecnt_t len = m.frames_per_bar (map.tempo_at (pos), _editor->session()->frame_rate()); + _region = _view->add_region (grab_frame(), len, false); + } } void -RegionCreateDrag::aborted () +RegionCreateDrag::aborted (bool) { + if (_region) { + _view->playlist()->thaw (); + } + /* XXX */ } @@ -1405,14 +1514,14 @@ void NoteResizeDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*ignored*/) { Gdk::Cursor* cursor; - ArdourCanvas::CanvasNote* cnote = dynamic_cast(_item); - float x_fraction = cnote->mouse_x_fraction (); + ArdourCanvas::CanvasNoteEvent* cnote = dynamic_cast(_item); + float x_fraction = cnote->mouse_x_fraction (); - if (x_fraction > 0.0 && x_fraction < 0.25) { - cursor = _editor->left_side_trim_cursor; - } else { - cursor = _editor->right_side_trim_cursor; - } + if (x_fraction > 0.0 && x_fraction < 0.25) { + cursor = _editor->cursors()->left_side_trim; + } else { + cursor = _editor->cursors()->right_side_trim; + } Drag::start_grab (event, cursor); @@ -1422,10 +1531,10 @@ NoteResizeDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*ignored*/) double const middle_point = region_start + cnote->x1() + (cnote->x2() - cnote->x1()) / 2.0L; if (grab_x() <= middle_point) { - cursor = _editor->left_side_trim_cursor; + cursor = _editor->cursors()->left_side_trim; at_front = true; } else { - cursor = _editor->right_side_trim_cursor; + cursor = _editor->cursors()->right_side_trim; at_front = false; } @@ -1463,7 +1572,7 @@ NoteResizeDrag::motion (GdkEvent* /*event*/, bool /*first_move*/) { MidiRegionSelection& ms (_editor->get_selection().midi_regions); for (MidiRegionSelection::iterator r = ms.begin(); r != ms.end(); ++r) { - (*r)->update_resizing (dynamic_cast(_item), at_front, _drags->current_pointer_x() - grab_x(), relative); + (*r)->update_resizing (dynamic_cast(_item), at_front, _drags->current_pointer_x() - grab_x(), relative); } } @@ -1472,14 +1581,17 @@ NoteResizeDrag::finished (GdkEvent*, bool /*movement_occurred*/) { MidiRegionSelection& ms (_editor->get_selection().midi_regions); for (MidiRegionSelection::iterator r = ms.begin(); r != ms.end(); ++r) { - (*r)->commit_resizing (dynamic_cast(_item), at_front, _drags->current_pointer_x() - grab_x(), relative); + (*r)->commit_resizing (dynamic_cast(_item), at_front, _drags->current_pointer_x() - grab_x(), relative); } } void -NoteResizeDrag::aborted () +NoteResizeDrag::aborted (bool) { - /* XXX: TODO */ + MidiRegionSelection& ms (_editor->get_selection().midi_regions); + for (MidiRegionSelection::iterator r = ms.begin(); r != ms.end(); ++r) { + (*r)->abort_resizing (); + } } RegionGainDrag::RegionGainDrag (Editor* e, ArdourCanvas::Item* i) @@ -1501,14 +1613,13 @@ RegionGainDrag::finished (GdkEvent *, bool) } void -RegionGainDrag::aborted () +RegionGainDrag::aborted (bool) { /* XXX: TODO */ } TrimDrag::TrimDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list const & v) : RegionDrag (e, i, p, v) - , _have_transaction (false) { DEBUG_TRACE (DEBUG::Drags, "New TrimDrag\n"); } @@ -1531,30 +1642,34 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*) framepos_t const pf = adjusted_current_frame (event); if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { + /* Move the contents of the region around without changing the region bounds */ _operation = ContentsTrim; - Drag::start_grab (event, _editor->trimmer_cursor); + Drag::start_grab (event, _editor->cursors()->trimmer); } else { /* These will get overridden for a point trim.*/ if (pf < (region_start + region_length/2)) { - /* closer to start */ + /* closer to front */ _operation = StartTrim; - Drag::start_grab (event, _editor->left_side_trim_cursor); + Drag::start_grab (event, _editor->cursors()->left_side_trim); } else { /* closer to end */ _operation = EndTrim; - Drag::start_grab (event, _editor->right_side_trim_cursor); - } + Drag::start_grab (event, _editor->cursors()->right_side_trim); + } } switch (_operation) { case StartTrim: - _editor->show_verbose_time_cursor (region_start, 10); + show_verbose_cursor_time (region_start); + for (list::iterator i = _views.begin(); i != _views.end(); ++i) { + i->view->trim_front_starting (); + } break; case EndTrim: - _editor->show_verbose_time_cursor (region_end, 10); + show_verbose_cursor_time (region_end); break; case ContentsTrim: - _editor->show_verbose_time_cursor (pf, 10); + show_verbose_cursor_time (pf); break; } @@ -1577,7 +1692,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) speed = tv->track()->speed(); } - framecnt_t const dt = adjusted_current_frame (event) - grab_frame (); + framecnt_t const dt = adjusted_current_frame (event) - raw_grab_frame () + _pointer_frame_offset; if (first_move) { @@ -1596,13 +1711,12 @@ TrimDrag::motion (GdkEvent* event, bool first_move) } _editor->begin_reversible_command (trim_type); - _have_transaction = true; for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { RegionView* rv = i->view; rv->fake_set_opaque (false); rv->enable_display (false); - rv->region()->clear_changes (); + rv->region()->playlist()->clear_owned_changes (); AudioRegionView* const arv = dynamic_cast (rv); @@ -1628,7 +1742,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) switch (_operation) { case StartTrim: for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { - i->view->trim_start (i->initial_position + dt, non_overlap_trim); + i->view->trim_front (i->initial_position + dt, non_overlap_trim); } break; @@ -1647,7 +1761,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) } framecnt_t frame_delta = 0; - + bool left_direction = false; if (last_pointer_frame() > adjusted_current_frame(event)) { left_direction = true; @@ -1668,13 +1782,13 @@ TrimDrag::motion (GdkEvent* event, bool first_move) switch (_operation) { case StartTrim: - _editor->show_verbose_time_cursor ((framepos_t) (rv->region()->position() / speed), 10); + show_verbose_cursor_time ((framepos_t) (rv->region()->position() / speed)); break; case EndTrim: - _editor->show_verbose_time_cursor ((framepos_t) (rv->region()->last_frame() / speed), 10); + show_verbose_cursor_time ((framepos_t) (rv->region()->last_frame() / speed)); break; case ContentsTrim: - _editor->show_verbose_time_cursor (adjusted_current_frame (event), 10); + show_verbose_cursor_time (adjusted_current_frame (event)); break; } } @@ -1686,17 +1800,39 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred) if (movement_occurred) { motion (event, false); + /* This must happen before the region's StatefulDiffCommand is created, as it may + `correct' (ahem) the region's _start from being negative to being zero. It + needs to be zero in the undo record. + */ + if (_operation == StartTrim) { + for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { + i->view->trim_front_ending (); + } + } + if (!_editor->selection->selected (_primary)) { _primary->thaw_after_trim (); } else { + set > diffed_playlists; + for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { - i->view->thaw_after_trim (); + i->view->thaw_after_trim (); i->view->enable_display (true); i->view->fake_set_opaque (true); - if (_have_transaction) { - _editor->session()->add_command (new StatefulDiffCommand (i->view->region())); - } + + /* Trimming one region may affect others on the playlist, so we need + to get undo Commands from the whole playlist rather than just the + region. Use diffed_playlists to make sure we don't diff a given + playlist more than once. + */ + boost::shared_ptr p = i->view->region()->playlist (); + if (diffed_playlists.find (p) == diffed_playlists.end()) { + vector cmds; + p->rdiff (cmds); + _editor->session()->add_commands (cmds); + diffed_playlists.insert (p); + } } } for (set >::iterator p = _editor->motion_frozen_playlists.begin(); p != _editor->motion_frozen_playlists.end(); ++p) { @@ -1704,10 +1840,7 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred) } _editor->motion_frozen_playlists.clear (); - - if (_have_transaction) { - _editor->commit_reversible_command(); - } + _editor->commit_reversible_command(); } else { /* no mouse movement */ @@ -1715,12 +1848,16 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred) } for (list::const_iterator i = _views.begin(); i != _views.end(); ++i) { + if (_operation == StartTrim) { + i->view->trim_front_ending (); + } + i->view->region()->resume_property_changes (); } } void -TrimDrag::aborted () +TrimDrag::aborted (bool movement_occurred) { /* Our motion method is changing model state, so use the Undo system to cancel. Perhaps not ideal, as this will leave an Undo point @@ -1728,8 +1865,8 @@ TrimDrag::aborted () */ finished (0, true); - - if (_have_transaction) { + + if (movement_occurred) { _editor->undo (); } @@ -1738,12 +1875,35 @@ TrimDrag::aborted () } } +void +TrimDrag::setup_pointer_frame_offset () +{ + list::iterator i = _views.begin (); + while (i != _views.end() && i->view != _primary) { + ++i; + } + + if (i == _views.end()) { + return; + } + + switch (_operation) { + case StartTrim: + _pointer_frame_offset = raw_grab_frame() - i->initial_position; + break; + case EndTrim: + _pointer_frame_offset = raw_grab_frame() - i->initial_end; + break; + case ContentsTrim: + break; + } +} + MeterMarkerDrag::MeterMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) : Drag (e, i), _copy (c) { DEBUG_TRACE (DEBUG::Drags, "New MeterMarkerDrag\n"); - _marker = reinterpret_cast (_item->get_data ("marker")); assert (_marker); } @@ -1751,49 +1911,58 @@ MeterMarkerDrag::MeterMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) void MeterMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) { - if (_copy) { - // create a dummy marker for visual representation of moving the copy. - // The actual copying is not done before we reach the finish callback. - char name[64]; - snprintf (name, sizeof(name), "%g/%g", _marker->meter().beats_per_bar(), _marker->meter().note_divisor ()); - - MeterMarker* new_marker = new MeterMarker ( - *_editor, - *_editor->meter_group, - *_editor->cursor_group, - ARDOUR_UI::config()->canvasvar_MeterMarker.get(), - name, - *new MeterSection (_marker->meter()) - ); + Drag::start_grab (event, cursor); + show_verbose_cursor_time (adjusted_current_frame(event)); +} - _item = &new_marker->the_item (); - _marker = new_marker; +void +MeterMarkerDrag::setup_pointer_frame_offset () +{ + _pointer_frame_offset = raw_grab_frame() - _marker->meter().frame(); +} - } else { +void +MeterMarkerDrag::motion (GdkEvent* event, bool first_move) +{ + if (first_move) { - MetricSection& section (_marker->meter()); + // create a dummy marker for visual representation of moving the + // section, because whether its a copy or not, we're going to + // leave or lose the original marker (leave if its a copy; lose if its + // not, because we'll remove it from the map). + + MeterSection section (_marker->meter()); if (!section.movable()) { return; } - + + char name[64]; + snprintf (name, sizeof(name), "%g/%g", _marker->meter().divisions_per_bar(), _marker->meter().note_divisor ()); + + _marker = new MeterMarker ( + *_editor, + *_editor->meter_group, + ARDOUR_UI::config()->canvasvar_MeterMarker.get(), + name, + *new MeterSection (_marker->meter()) + ); + + /* use the new marker for the grab */ + swap_grab (&_marker->the_item(), 0, GDK_CURRENT_TIME); + + if (!_copy) { + TempoMap& map (_editor->session()->tempo_map()); + /* get current state */ + before_state = &map.get_state(); + /* remove the section while we drag it */ + map.remove_meter (section, true); + } } - Drag::start_grab (event, cursor); - - _pointer_frame_offset = raw_grab_frame() - _marker->meter().frame(); - - _editor->show_verbose_time_cursor (adjusted_current_frame(event), 10); -} - -void -MeterMarkerDrag::motion (GdkEvent* event, bool) -{ framepos_t const pf = adjusted_current_frame (event); - _marker->set_position (pf); - - _editor->show_verbose_time_cursor (pf, 10); + show_verbose_cursor_time (pf); } void @@ -1805,11 +1974,11 @@ MeterMarkerDrag::finished (GdkEvent* event, bool movement_occurred) motion (event, false); - BBT_Time when; + Timecode::BBT_Time when; TempoMap& map (_editor->session()->tempo_map()); map.bbt_time (last_pointer_frame(), when); - + if (_copy == true) { _editor->begin_reversible_command (_("copy meter mark")); XMLNode &before = map.get_state(); @@ -1818,23 +1987,35 @@ MeterMarkerDrag::finished (GdkEvent* event, bool movement_occurred) _editor->session()->add_command(new MementoCommand(map, &before, &after)); _editor->commit_reversible_command (); - // delete the dummy marker we used for visual representation of copying. - // a new visual marker will show up automatically. - delete _marker; } else { _editor->begin_reversible_command (_("move meter mark")); - XMLNode &before = map.get_state(); - map.move_meter (_marker->meter(), when); + + /* we removed it before, so add it back now */ + + map.add_meter (_marker->meter(), when); XMLNode &after = map.get_state(); - _editor->session()->add_command(new MementoCommand(map, &before, &after)); + _editor->session()->add_command(new MementoCommand(map, before_state, &after)); _editor->commit_reversible_command (); } + + // delete the dummy marker we used for visual representation while moving. + // a new visual marker will show up automatically. + delete _marker; } void -MeterMarkerDrag::aborted () +MeterMarkerDrag::aborted (bool moved) { _marker->set_position (_marker->meter().frame ()); + + if (moved) { + TempoMap& map (_editor->session()->tempo_map()); + /* we removed it before, so add it back now */ + map.add_meter (_marker->meter(), _marker->meter().frame()); + // delete the dummy marker we used for visual representation while moving. + // a new visual marker will show up automatically. + delete _marker; + } } TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) @@ -1842,7 +2023,7 @@ TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) _copy (c) { DEBUG_TRACE (DEBUG::Drags, "New TempoMarkerDrag\n"); - + _marker = reinterpret_cast (_item->get_data ("marker")); assert (_marker); } @@ -1850,47 +2031,57 @@ TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) void TempoMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) { + Drag::start_grab (event, cursor); + show_verbose_cursor_time (adjusted_current_frame (event)); +} - if (_copy) { +void +TempoMarkerDrag::setup_pointer_frame_offset () +{ + _pointer_frame_offset = raw_grab_frame() - _marker->tempo().frame(); +} +void +TempoMarkerDrag::motion (GdkEvent* event, bool first_move) +{ + if (first_move) { + + // create a dummy marker for visual representation of moving the + // section, because whether its a copy or not, we're going to + // leave or lose the original marker (leave if its a copy; lose if its + // not, because we'll remove it from the map). + // create a dummy marker for visual representation of moving the copy. // The actual copying is not done before we reach the finish callback. + char name[64]; snprintf (name, sizeof (name), "%.2f", _marker->tempo().beats_per_minute()); - TempoMarker* new_marker = new TempoMarker ( + TempoSection section (_marker->tempo()); + + _marker = new TempoMarker ( *_editor, *_editor->tempo_group, - *_editor->cursor_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), name, *new TempoSection (_marker->tempo()) ); - _item = &new_marker->the_item (); - _marker = new_marker; - - } else { - - MetricSection& section (_marker->tempo()); + /* use the new marker for the grab */ + swap_grab (&_marker->the_item(), 0, GDK_CURRENT_TIME); - if (!section.movable()) { - return; + if (!_copy) { + TempoMap& map (_editor->session()->tempo_map()); + /* get current state */ + before_state = &map.get_state(); + /* remove the section while we drag it */ + map.remove_tempo (section, true); } } - Drag::start_grab (event, cursor); - - _pointer_frame_offset = raw_grab_frame() - _marker->tempo().frame(); - _editor->show_verbose_time_cursor (adjusted_current_frame (event), 10); -} - -void -TempoMarkerDrag::motion (GdkEvent* event, bool) -{ framepos_t const pf = adjusted_current_frame (event); _marker->set_position (pf); - _editor->show_verbose_time_cursor (pf, 10); + show_verbose_cursor_time (pf); } void @@ -1902,10 +2093,11 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred) motion (event, false); - BBT_Time when; - TempoMap& map (_editor->session()->tempo_map()); - map.bbt_time (last_pointer_frame(), when); + framepos_t beat_time = map.round_to_beat (last_pointer_frame(), 0); + Timecode::BBT_Time when; + + map.bbt_time (beat_time, when); if (_copy == true) { _editor->begin_reversible_command (_("copy tempo mark")); @@ -1915,23 +2107,32 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred) _editor->session()->add_command (new MementoCommand(map, &before, &after)); _editor->commit_reversible_command (); - // delete the dummy marker we used for visual representation of copying. - // a new visual marker will show up automatically. - delete _marker; } else { _editor->begin_reversible_command (_("move tempo mark")); - XMLNode &before = map.get_state(); - map.move_tempo (_marker->tempo(), when); + /* we removed it before, so add it back now */ + map.add_tempo (_marker->tempo(), when); XMLNode &after = map.get_state(); - _editor->session()->add_command (new MementoCommand(map, &before, &after)); + _editor->session()->add_command (new MementoCommand(map, before_state, &after)); _editor->commit_reversible_command (); } + + // delete the dummy marker we used for visual representation while moving. + // a new visual marker will show up automatically. + delete _marker; } void -TempoMarkerDrag::aborted () +TempoMarkerDrag::aborted (bool moved) { _marker->set_position (_marker->tempo().frame()); + if (moved) { + TempoMap& map (_editor->session()->tempo_map()); + /* we removed it before, so add it back now */ + map.add_tempo (_marker->tempo(), _marker->tempo().start()); + // delete the dummy marker we used for visual representation while moving. + // a new visual marker will show up automatically. + delete _marker; + } } CursorDrag::CursorDrag (Editor* e, ArdourCanvas::Item* i, bool s) @@ -1939,79 +2140,70 @@ CursorDrag::CursorDrag (Editor* e, ArdourCanvas::Item* i, bool s) _stop (s) { DEBUG_TRACE (DEBUG::Drags, "New CursorDrag\n"); - - _cursor = reinterpret_cast (_item->get_data ("cursor")); - assert (_cursor); } +/** Do all the things we do when dragging the playhead to make it look as though + * we have located, without actually doing the locate (because that would cause + * the diskstream buffers to be refilled, which is too slow). + */ void -CursorDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) +CursorDrag::fake_locate (framepos_t t) { - Drag::start_grab (event, c); + _editor->playhead_cursor->set_position (t); - if (!_stop) { + Session* s = _editor->session (); + if (s->timecode_transmission_suspended ()) { + framepos_t const f = _editor->playhead_cursor->current_frame; + s->send_mmc_locate (f); + s->send_full_time_code (f); + } - framepos_t where = _editor->event_frame (event, 0, 0); + show_verbose_cursor_time (t); + _editor->UpdateAllTransportClocks (t); +} - _editor->snap_to_with_modifier (where, event); - _editor->playhead_cursor->set_position (where); +void +CursorDrag::start_grab (GdkEvent* event, Gdk::Cursor* c) +{ + Drag::start_grab (event, c); - } + _grab_zoom = _editor->frames_per_unit; - if (_cursor == _editor->playhead_cursor) { - _editor->_dragging_playhead = true; + framepos_t where = _editor->event_frame (event, 0, 0); + _editor->snap_to_with_modifier (where, event); - Session* s = _editor->session (); + _editor->_dragging_playhead = true; - if (s) { - if (_was_rolling && _stop) { - s->request_stop (); - } + Session* s = _editor->session (); - if (s->is_auditioning()) { - s->cancel_audition (); - } + if (s) { + if (_was_rolling && _stop) { + s->request_stop (); + } - s->request_suspend_timecode_transmission (); + if (s->is_auditioning()) { + s->cancel_audition (); + } - if (s->timecode_transmission_suspended ()) { - framepos_t const f = _editor->playhead_cursor->current_frame; - s->send_mmc_locate (f); - s->send_full_time_code (f); - } + s->request_suspend_timecode_transmission (); + while (!s->timecode_transmission_suspended ()) { + /* twiddle our thumbs */ } } - _pointer_frame_offset = raw_grab_frame() - _cursor->current_frame; - - _editor->show_verbose_time_cursor (_cursor->current_frame, 10); + fake_locate (where); } void CursorDrag::motion (GdkEvent* event, bool) { framepos_t const adjusted_frame = adjusted_current_frame (event); - - if (adjusted_frame == last_pointer_frame()) { - return; - } - - _cursor->set_position (adjusted_frame); - - _editor->show_verbose_time_cursor (_cursor->current_frame, 10); - - Session* s = _editor->session (); - if (s && _item == &_editor->playhead_cursor->canvas_item && s->timecode_transmission_suspended ()) { - framepos_t const f = _editor->playhead_cursor->current_frame; - s->send_mmc_locate (f); - s->send_full_time_code (f); - } - - + if (adjusted_frame != last_pointer_frame()) { + fake_locate (adjusted_frame); #ifdef GTKOSX - _editor->update_canvas_now (); + _editor->update_canvas_now (); #endif - _editor->UpdateAllTransportClocks (_cursor->current_frame); + } } void @@ -2025,25 +2217,23 @@ CursorDrag::finished (GdkEvent* event, bool movement_occurred) motion (event, false); - if (_item == &_editor->playhead_cursor->canvas_item) { - Session* s = _editor->session (); - if (s) { - s->request_locate (_editor->playhead_cursor->current_frame, _was_rolling); - _editor->_pending_locate_request = true; - s->request_resume_timecode_transmission (); - } + Session* s = _editor->session (); + if (s) { + s->request_locate (_editor->playhead_cursor->current_frame, _was_rolling); + _editor->_pending_locate_request = true; + s->request_resume_timecode_transmission (); } } void -CursorDrag::aborted () +CursorDrag::aborted (bool) { if (_editor->_dragging_playhead) { _editor->session()->request_resume_timecode_transmission (); _editor->_dragging_playhead = false; } - - _cursor->set_position (adjusted_frame (grab_frame (), 0, false)); + + _editor->playhead_cursor->set_position (adjusted_frame (grab_frame (), 0, false)); } FadeInDrag::FadeInDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list const & v) @@ -2060,12 +2250,19 @@ FadeInDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) AudioRegionView* arv = dynamic_cast (_primary); boost::shared_ptr const r = arv->audio_region (); - _pointer_frame_offset = raw_grab_frame() - ((framecnt_t) r->fade_in()->back()->when + r->position()); - _editor->show_verbose_duration_cursor (r->position(), r->position() + r->fade_in()->back()->when, 10); - + show_verbose_cursor_duration (r->position(), r->position() + r->fade_in()->back()->when, 32); + arv->show_fade_line((framepos_t) r->fade_in()->back()->when); } +void +FadeInDrag::setup_pointer_frame_offset () +{ + AudioRegionView* arv = dynamic_cast (_primary); + boost::shared_ptr const r = arv->audio_region (); + _pointer_frame_offset = raw_grab_frame() - ((framecnt_t) r->fade_in()->back()->when + r->position()); +} + void FadeInDrag::motion (GdkEvent* event, bool) { @@ -2095,7 +2292,7 @@ FadeInDrag::motion (GdkEvent* event, bool) tmp->show_fade_line((framecnt_t) fade_length); } - _editor->show_verbose_duration_cursor (region->position(), region->position() + fade_length, 10); + show_verbose_cursor_duration (region->position(), region->position() + fade_length, 32); } void @@ -2144,7 +2341,7 @@ FadeInDrag::finished (GdkEvent* event, bool movement_occurred) } void -FadeInDrag::aborted () +FadeInDrag::aborted (bool) { for (list::iterator i = _views.begin(); i != _views.end(); ++i) { AudioRegionView* tmp = dynamic_cast (i->view); @@ -2172,12 +2369,19 @@ FadeOutDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) AudioRegionView* arv = dynamic_cast (_primary); boost::shared_ptr r = arv->audio_region (); - _pointer_frame_offset = raw_grab_frame() - (r->length() - (framecnt_t) r->fade_out()->back()->when + r->position()); - _editor->show_verbose_duration_cursor (r->last_frame() - r->fade_out()->back()->when, r->last_frame(), 10); - + show_verbose_cursor_duration (r->last_frame() - r->fade_out()->back()->when, r->last_frame()); + arv->show_fade_line(r->length() - r->fade_out()->back()->when); } +void +FadeOutDrag::setup_pointer_frame_offset () +{ + AudioRegionView* arv = dynamic_cast (_primary); + boost::shared_ptr r = arv->audio_region (); + _pointer_frame_offset = raw_grab_frame() - (r->length() - (framecnt_t) r->fade_out()->back()->when + r->position()); +} + void FadeOutDrag::motion (GdkEvent* event, bool) { @@ -2209,7 +2413,7 @@ FadeOutDrag::motion (GdkEvent* event, bool) tmp->show_fade_line(region->length() - fade_length); } - _editor->show_verbose_duration_cursor (region->last_frame() - fade_length, region->last_frame(), 10); + show_verbose_cursor_duration (region->last_frame() - fade_length, region->last_frame()); } void @@ -2260,7 +2464,7 @@ FadeOutDrag::finished (GdkEvent* event, bool movement_occurred) } void -FadeOutDrag::aborted () +FadeOutDrag::aborted (bool) { for (list::iterator i = _views.begin(); i != _views.end(); ++i) { AudioRegionView* tmp = dynamic_cast (i->view); @@ -2278,19 +2482,12 @@ MarkerDrag::MarkerDrag (Editor* e, ArdourCanvas::Item* i) : Drag (e, i) { DEBUG_TRACE (DEBUG::Drags, "New MarkerDrag\n"); - + _marker = reinterpret_cast (_item->get_data ("marker")); assert (_marker); _points.push_back (Gnome::Art::Point (0, 0)); _points.push_back (Gnome::Art::Point (0, physical_screen_height (_editor->get_window()))); - - _line = new ArdourCanvas::Line (*_editor->timebar_group); - _line->property_width_pixels() = 1; - _line->property_points () = _points; - _line->hide (); - - _line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerDragLine.get(); } MarkerDrag::~MarkerDrag () @@ -2310,17 +2507,15 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) Location *location = _editor->find_location_from_marker (_marker, is_start); _editor->_dragging_edit_point = true; - _pointer_frame_offset = raw_grab_frame() - (is_start ? location->start() : location->end()); - update_item (location); // _drag_line->show(); // _line->raise_to_top(); if (is_start) { - _editor->show_verbose_time_cursor (location->start(), 10); + show_verbose_cursor_time (location->start()); } else { - _editor->show_verbose_time_cursor (location->end(), 10); + show_verbose_cursor_time (location->end()); } Selection::Operation op = ArdourKeyboard::selection_type (event->button.state); @@ -2377,6 +2572,14 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) } } +void +MarkerDrag::setup_pointer_frame_offset () +{ + bool is_start; + Location *location = _editor->find_location_from_marker (_marker, is_start); + _pointer_frame_offset = raw_grab_frame() - (is_start ? location->start() : location->end()); +} + void MarkerDrag::motion (GdkEvent* event, bool) { @@ -2391,10 +2594,6 @@ MarkerDrag::motion (GdkEvent* event, bool) framepos_t next = newframe; - if (newframe == last_pointer_frame()) { - return; - } - if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { move_both = true; } @@ -2488,7 +2687,7 @@ MarkerDrag::motion (GdkEvent* event, bool) copy_location->set_end (new_end); } else if (new_start < copy_location->end()) { copy_location->set_start (new_start); - } else { + } else if (newframe > 0) { _editor->snap_to (next, 1, true); copy_location->set_end (next); copy_location->set_start (newframe); @@ -2520,7 +2719,7 @@ MarkerDrag::motion (GdkEvent* event, bool) assert (!_copied_locations.empty()); - _editor->show_verbose_time_cursor (newframe, 10); + show_verbose_cursor_time (newframe); #ifdef GTKOSX _editor->update_canvas_now (); @@ -2586,24 +2785,18 @@ MarkerDrag::finished (GdkEvent* event, bool movement_occurred) XMLNode &after = _editor->session()->locations()->get_state(); _editor->session()->add_command(new MementoCommand(*(_editor->session()->locations()), &before, &after)); _editor->commit_reversible_command (); - - _line->hide(); } void -MarkerDrag::aborted () +MarkerDrag::aborted (bool) { /* XXX: TODO */ } void -MarkerDrag::update_item (Location* location) +MarkerDrag::update_item (Location*) { - double const x1 = _editor->frame_to_pixel (location->start()); - - _points.front().set_x(x1); - _points.back().set_x(x1); - _line->property_points() = _points; + /* noop */ } ControlPointDrag::ControlPointDrag (Editor* e, ArdourCanvas::Item* i) @@ -2611,8 +2804,12 @@ ControlPointDrag::ControlPointDrag (Editor* e, ArdourCanvas::Item* i) _cumulative_x_drag (0), _cumulative_y_drag (0) { + if (_zero_gain_fraction < 0.0) { + _zero_gain_fraction = gain_to_slider_position_with_max (dB_to_coefficient (0.0), Config->get_max_gain()); + } + DEBUG_TRACE (DEBUG::Drags, "New ControlPointDrag\n"); - + _point = reinterpret_cast (_item->get_data ("control_point")); assert (_point); } @@ -2621,7 +2818,7 @@ ControlPointDrag::ControlPointDrag (Editor* e, ArdourCanvas::Item* i) void ControlPointDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*cursor*/) { - Drag::start_grab (event, _editor->fader_cursor); + Drag::start_grab (event, _editor->cursors()->fader); // start the grab at the center of the control point so // the point doesn't 'jump' to the mouse after the first drag @@ -2632,10 +2829,10 @@ ControlPointDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*cursor*/) _point->line().start_drag_single (_point, _fixed_grab_x, fraction); - _editor->set_verbose_canvas_cursor (_point->line().get_verbose_cursor_string (fraction), - event->button.x + 10, event->button.y + 10); + _editor->verbose_cursor()->set (_point->line().get_verbose_cursor_string (fraction), + event->button.x + 10, event->button.y + 10); - _editor->show_verbose_canvas_cursor (); + _editor->verbose_cursor()->show (); } void @@ -2678,7 +2875,7 @@ ControlPointDrag::motion (GdkEvent* event, bool) cy = min ((double) _point->line().height(), cy); framepos_t cx_frames = _editor->unit_to_frame (cx); - + if (!_x_constrained) { _editor->snap_to_with_modifier (cx_frames, event); } @@ -2691,7 +2888,7 @@ ControlPointDrag::motion (GdkEvent* event, bool) _point->line().drag_motion (_editor->frame_to_unit (cx_frames), fraction, false, push); - _editor->set_verbose_canvas_cursor_text (_point->line().get_verbose_cursor_string (fraction)); + _editor->verbose_cursor()->set_text (_point->line().get_verbose_cursor_string (fraction)); } void @@ -2708,13 +2905,13 @@ ControlPointDrag::finished (GdkEvent* event, bool movement_occurred) } else { motion (event, false); } - + _point->line().end_drag (); _editor->session()->commit_reversible_command (); } void -ControlPointDrag::aborted () +ControlPointDrag::aborted (bool) { _point->line().reset (); } @@ -2760,13 +2957,13 @@ LineDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*cursor*/) uint32_t before; uint32_t after; - + if (!_line->control_points_adjacent (frame_within_region, before, after)) { /* no adjacent points */ return; } - Drag::start_grab (event, _editor->fader_cursor); + Drag::start_grab (event, _editor->cursors()->fader); /* store grab start in parent frame */ @@ -2777,10 +2974,10 @@ LineDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*cursor*/) _line->start_drag_line (before, after, fraction); - _editor->set_verbose_canvas_cursor (_line->get_verbose_cursor_string (fraction), - event->button.x + 10, event->button.y + 10); + _editor->verbose_cursor()->set (_line->get_verbose_cursor_string (fraction), + event->button.x + 10, event->button.y + 10); - _editor->show_verbose_canvas_cursor (); + _editor->verbose_cursor()->show (); } void @@ -2812,7 +3009,7 @@ LineDrag::motion (GdkEvent* event, bool) /* we are ignoring x position for this drag, so we can just pass in anything */ _line->drag_motion (0, fraction, true, push); - _editor->set_verbose_canvas_cursor_text (_line->get_verbose_cursor_string (fraction)); + _editor->verbose_cursor()->set_text (_line->get_verbose_cursor_string (fraction)); } void @@ -2824,7 +3021,7 @@ LineDrag::finished (GdkEvent* event, bool) } void -LineDrag::aborted () +LineDrag::aborted (bool) { _line->reset (); } @@ -2841,8 +3038,8 @@ void FeatureLineDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*cursor*/) { Drag::start_grab (event); - - _line = reinterpret_cast (_item); + + _line = reinterpret_cast (_item); assert (_line); /* need to get x coordinate in terms of parent (AudioRegionView) origin. */ @@ -2854,11 +3051,11 @@ FeatureLineDrag::start_grab (GdkEvent* event, Gdk::Cursor* /*cursor*/) /* store grab start in parent frame */ _region_view_grab_x = cx; - - _before = _line->property_x1(); - + + _before = *(float*) _item->get_data ("position"); + _arv = reinterpret_cast (_item->get_data ("regionview")); - + _max_x = _editor->frame_to_pixel(_arv->get_duration()); } @@ -2866,35 +3063,48 @@ void FeatureLineDrag::motion (GdkEvent*, bool) { double dx = _drags->current_pointer_x() - last_pointer_x(); - + double cx = _region_view_grab_x + _cumulative_x_drag + dx; - + _cumulative_x_drag += dx; - + /* Clamp the min and max extent of the drag to keep it within the region view bounds */ - + if (cx > _max_x){ cx = _max_x; } else if(cx < 0){ cx = 0; } - - _line->property_x1() = cx; - _line->property_x2() = cx; - _before = _line->property_x1(); + ArdourCanvas::Points points; + + double x1 = 0, x2 = 0, y1 = 0, y2 = 0; + + _line->get_bounds(x1, y2, x2, y2); + + points.push_back(Gnome::Art::Point(cx, 2.0)); // first x-coord needs to be a non-normal value + points.push_back(Gnome::Art::Point(cx, y2 - y1)); + + _line->property_points() = points; + + float *pos = new float; + *pos = cx; + + _line->set_data ("position", pos); + + _before = cx; } void FeatureLineDrag::finished (GdkEvent*, bool) { _arv = reinterpret_cast (_item->get_data ("regionview")); - _arv->update_transient(_before, _line->property_x1()); + _arv->update_transient(_before, _before); } void -FeatureLineDrag::aborted () +FeatureLineDrag::aborted (bool) { //_line->reset (); } @@ -2909,7 +3119,7 @@ void RubberbandSelectDrag::start_grab (GdkEvent* event, Gdk::Cursor *) { Drag::start_grab (event); - _editor->show_verbose_time_cursor (adjusted_current_frame (event), 10); + show_verbose_cursor_time (adjusted_current_frame (event)); } void @@ -2959,56 +3169,59 @@ RubberbandSelectDrag::motion (GdkEvent* event, bool) _editor->rubberband_rect->show(); _editor->rubberband_rect->raise_to_top(); - _editor->show_verbose_time_cursor (pf, 10); + show_verbose_cursor_time (pf); + + do_select_things (event, true); } } void -RubberbandSelectDrag::finished (GdkEvent* event, bool movement_occurred) +RubberbandSelectDrag::do_select_things (GdkEvent* event, bool drag_in_progress) { - if (movement_occurred) { - - motion (event, false); + framepos_t x1; + framepos_t x2; + + if (grab_frame() < last_pointer_frame()) { + x1 = grab_frame (); + x2 = last_pointer_frame (); + } else { + x2 = grab_frame (); + x1 = last_pointer_frame (); + } - double y1,y2; - if (_drags->current_pointer_y() < grab_y()) { - y1 = _drags->current_pointer_y(); - y2 = grab_y(); - } else { - y2 = _drags->current_pointer_y(); - y1 = grab_y(); - } + double y1; + double y2; + + if (_drags->current_pointer_y() < grab_y()) { + y1 = _drags->current_pointer_y(); + y2 = grab_y(); + } else { + y2 = _drags->current_pointer_y(); + y1 = grab_y(); + } + select_things (event->button.state, x1, x2, y1, y2, drag_in_progress); +} - Selection::Operation op = ArdourKeyboard::selection_type (event->button.state); - bool committed; +void +RubberbandSelectDrag::finished (GdkEvent* event, bool movement_occurred) +{ + if (movement_occurred) { - _editor->begin_reversible_command (_("rubberband selection")); + motion (event, false); + do_select_things (event, false); - if (grab_frame() < last_pointer_frame()) { - committed = _editor->select_all_within (grab_frame(), last_pointer_frame() - 1, y1, y2, _editor->track_views, op, false); - } else { - committed = _editor->select_all_within (last_pointer_frame(), grab_frame() - 1, y1, y2, _editor->track_views, op, false); - } + } else { - if (!committed) { - _editor->commit_reversible_command (); - } + deselect_things (); - } else { - if (!getenv("ARDOUR_SAE")) { - _editor->selection->clear_tracks(); - } - _editor->selection->clear_regions(); - _editor->selection->clear_points (); - _editor->selection->clear_lines (); } _editor->rubberband_rect->hide(); } void -RubberbandSelectDrag::aborted () +RubberbandSelectDrag::aborted (bool) { _editor->rubberband_rect->hide (); } @@ -3024,7 +3237,7 @@ TimeFXDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) { Drag::start_grab (event, cursor); - _editor->show_verbose_time_cursor (adjusted_current_frame (event), 10); + show_verbose_cursor_time (adjusted_current_frame (event)); } void @@ -3038,7 +3251,7 @@ TimeFXDrag::motion (GdkEvent* event, bool) rv->get_time_axis_view().show_timestretch (rv->region()->position(), pf); } - _editor->show_verbose_time_cursor (pf, 10); + show_verbose_cursor_time (pf); } void @@ -3066,8 +3279,6 @@ TimeFXDrag::finished (GdkEvent* /*event*/, bool movement_occurred) } #endif - _editor->begin_reversible_command (_("timestretch")); - // XXX how do timeFX on multiple regions ? RegionSelection rs; @@ -3079,7 +3290,7 @@ TimeFXDrag::finished (GdkEvent* /*event*/, bool movement_occurred) } void -TimeFXDrag::aborted () +TimeFXDrag::aborted (bool) { _primary->get_time_axis_view().hide_timestretch (); } @@ -3112,7 +3323,7 @@ ScrubDrag::finished (GdkEvent* /*event*/, bool movement_occurred) } void -ScrubDrag::aborted () +ScrubDrag::aborted (bool) { /* XXX: TODO */ } @@ -3130,9 +3341,6 @@ SelectionDrag::SelectionDrag (Editor* e, ArdourCanvas::Item* i, Operation o) void SelectionDrag::start_grab (GdkEvent* event, Gdk::Cursor*) { - framepos_t start = 0; - framepos_t end = 0; - if (_editor->session() == 0) { return; } @@ -3146,7 +3354,7 @@ SelectionDrag::start_grab (GdkEvent* event, Gdk::Cursor*) } else { _copy = false; } - cursor = _editor->selector_cursor; + cursor = _editor->cursors()->selector; Drag::start_grab (event, cursor); break; @@ -3154,36 +3362,49 @@ SelectionDrag::start_grab (GdkEvent* event, Gdk::Cursor*) if (_editor->clicked_axisview) { _editor->clicked_axisview->order_selection_trims (_item, true); } - Drag::start_grab (event, _editor->left_side_trim_cursor); - start = _editor->selection->time[_editor->clicked_selection].start; - _pointer_frame_offset = raw_grab_frame() - start; + Drag::start_grab (event, _editor->cursors()->left_side_trim); break; case SelectionEndTrim: if (_editor->clicked_axisview) { _editor->clicked_axisview->order_selection_trims (_item, false); } - Drag::start_grab (event, _editor->right_side_trim_cursor); - end = _editor->selection->time[_editor->clicked_selection].end; - _pointer_frame_offset = raw_grab_frame() - end; + Drag::start_grab (event, _editor->cursors()->right_side_trim); break; case SelectionMove: - start = _editor->selection->time[_editor->clicked_selection].start; Drag::start_grab (event, cursor); - _pointer_frame_offset = raw_grab_frame() - start; break; } if (_operation == SelectionMove) { - _editor->show_verbose_time_cursor (start, 10); + show_verbose_cursor_time (_editor->selection->time[_editor->clicked_selection].start); } else { - _editor->show_verbose_time_cursor (adjusted_current_frame (event), 10); + show_verbose_cursor_time (adjusted_current_frame (event)); } _original_pointer_time_axis = _editor->trackview_by_y_position (_drags->current_pointer_y ()).first->order (); } +void +SelectionDrag::setup_pointer_frame_offset () +{ + switch (_operation) { + case CreateSelection: + _pointer_frame_offset = 0; + break; + + case SelectionStartTrim: + case SelectionMove: + _pointer_frame_offset = raw_grab_frame() - _editor->selection->time[_editor->clicked_selection].start; + break; + + case SelectionEndTrim: + _pointer_frame_offset = raw_grab_frame() - _editor->selection->time[_editor->clicked_selection].end; + break; + } +} + void SelectionDrag::motion (GdkEvent* event, bool first_move) { @@ -3195,7 +3416,7 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) if (pending_time_axis.first == 0) { return; } - + framepos_t const pending_position = adjusted_current_frame (event); /* only alter selection if things have changed */ @@ -3229,7 +3450,7 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) if (_copy) { /* adding to the selection */ - _editor->set_selected_track_as_side_effect (Selection::Add); + _editor->set_selected_track_as_side_effect (Selection::Add); //_editor->selection->add (_editor->clicked_axisview); _editor->clicked_selection = _editor->selection->add (start, end); _copy = false; @@ -3237,17 +3458,17 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) /* new selection */ if (_editor->clicked_axisview && !_editor->selection->selected (_editor->clicked_axisview)) { - //_editor->selection->set (_editor->clicked_axisview); - _editor->set_selected_track_as_side_effect (Selection::Set); + //_editor->selection->set (_editor->clicked_axisview); + _editor->set_selected_track_as_side_effect (Selection::Set); } - + _editor->clicked_selection = _editor->selection->set (start, end); } } /* select the track that we're in */ if (find (_added_time_axes.begin(), _added_time_axes.end(), pending_time_axis.first) == _added_time_axes.end()) { - // _editor->set_selected_track_as_side_effect (Selection::Add); + // _editor->set_selected_track_as_side_effect (Selection::Add); _editor->selection->add (pending_time_axis.first); _added_time_axes.push_back (pending_time_axis.first); } @@ -3255,7 +3476,7 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) /* deselect any tracks that this drag no longer includes, being careful to only deselect tracks that we selected in the first place. */ - + int min_order = min (_original_pointer_time_axis, pending_time_axis.first->order()); int max_order = max (_original_pointer_time_axis, pending_time_axis.first->order()); @@ -3264,7 +3485,7 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) list::iterator tmp = i; ++tmp; - + if ((*i)->order() < min_order || (*i)->order() > max_order) { _editor->selection->remove (*i); _added_time_axes.remove (*i); @@ -3325,9 +3546,9 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) } if (_operation == SelectionMove) { - _editor->show_verbose_time_cursor(start, 10); + show_verbose_cursor_time(start); } else { - _editor->show_verbose_time_cursor(pending_position, 10); + show_verbose_cursor_time(pending_position); } } @@ -3359,7 +3580,7 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred) if (_editor->clicked_axisview && !_editor->selection->selected (_editor->clicked_axisview)) { _editor->selection->set (_editor->clicked_axisview); } - + if (s && s->get_play_range () && s->transport_rolling()) { s->request_stop (false, false); } @@ -3370,7 +3591,7 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred) } void -SelectionDrag::aborted () +SelectionDrag::aborted (bool) { /* XXX: TODO */ } @@ -3381,9 +3602,9 @@ RangeMarkerBarDrag::RangeMarkerBarDrag (Editor* e, ArdourCanvas::Item* i, Operat _copy (false) { DEBUG_TRACE (DEBUG::Drags, "New RangeMarkerBarDrag\n"); - - _drag_rect = new ArdourCanvas::SimpleRect (*_editor->time_line_group, 0.0, 0.0, 0.0, - physical_screen_height (_editor->get_window())); + + _drag_rect = new ArdourCanvas::SimpleRect (*_editor->time_line_group, 0.0, 0.0, 0.0, + physical_screen_height (_editor->get_window())); _drag_rect->hide (); _drag_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RangeDragRect.get(); @@ -3413,13 +3634,13 @@ RangeMarkerBarDrag::start_grab (GdkEvent* event, Gdk::Cursor *) } else { _copy = false; } - cursor = _editor->selector_cursor; + cursor = _editor->cursors()->selector; break; } Drag::start_grab (event, cursor); - _editor->show_verbose_time_cursor (adjusted_current_frame (event), 10); + show_verbose_cursor_time (adjusted_current_frame (event)); } void @@ -3450,7 +3671,7 @@ RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move) if (_operation == CreateRangeMarker || _operation == CreateTransportMarker || _operation == CreateCDMarker) { framepos_t grab = grab_frame (); _editor->snap_to (grab); - + if (pf < grab_frame()) { start = pf; end = grab; @@ -3491,7 +3712,7 @@ RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move) update_item (_editor->temp_location); } - _editor->show_verbose_time_cursor (pf, 10); + show_verbose_cursor_time (pf); } @@ -3524,7 +3745,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) newloc = new Location ( *_editor->session(), _editor->temp_location->start(), _editor->temp_location->end(), rangename, (Location::Flags) flags ); - + _editor->session()->locations()->add (newloc, true); XMLNode &after = _editor->session()->locations()->get_state(); _editor->session()->add_command(new MementoCommand(*(_editor->session()->locations()), &before, &after)); @@ -3576,7 +3797,7 @@ RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred) } void -RangeMarkerBarDrag::aborted () +RangeMarkerBarDrag::aborted (bool) { /* XXX: TODO */ } @@ -3602,14 +3823,14 @@ void MouseZoomDrag::start_grab (GdkEvent* event, Gdk::Cursor *) { if (Keyboard::the_keyboard().key_is_down (GDK_Control_L)) { - Drag::start_grab (event, _editor->zoom_out_cursor); + Drag::start_grab (event, _editor->cursors()->zoom_out); _zoom_out = true; } else { - Drag::start_grab (event, _editor->zoom_in_cursor); + Drag::start_grab (event, _editor->cursors()->zoom_in); _zoom_out = false; } - - _editor->show_verbose_time_cursor (adjusted_current_frame (event), 10); + + show_verbose_cursor_time (adjusted_current_frame (event)); } void @@ -3641,7 +3862,7 @@ MouseZoomDrag::motion (GdkEvent* event, bool first_move) _editor->reposition_zoom_rect(start, end); - _editor->show_verbose_time_cursor (pf, 10); + show_verbose_cursor_time (pf); } } @@ -3657,14 +3878,18 @@ MouseZoomDrag::finished (GdkEvent* event, bool movement_occurred) _editor->temporal_zoom_by_frame (last_pointer_frame(), grab_frame(), "mouse zoom"); } } else { - _editor->temporal_zoom_to_frame (_zoom_out, grab_frame()); + if (Keyboard::the_keyboard().key_is_down (GDK_Shift_L)) { + _editor->tav_zoom_step (_zoom_out); + } else { + _editor->temporal_zoom_to_frame (_zoom_out, grab_frame()); + } } _editor->zoom_rect->hide(); } void -MouseZoomDrag::aborted () +MouseZoomDrag::aborted (bool) { _editor->zoom_rect->hide (); } @@ -3715,65 +3940,60 @@ NoteDrag::total_dx () const frameoffset_t const dx = _editor->unit_to_frame (_drags->current_pointer_x() - grab_x()); /* primary note time */ - frameoffset_t const n = _region->beats_to_frames (_primary->note()->time ()); - - /* new time of the primary note relative to the region position */ - frameoffset_t const st = n + dx; + frameoffset_t const n = _region->source_beats_to_absolute_frames (_primary->note()->time ()); + + /* new time of the primary note in session frames */ + frameoffset_t st = n + dx; + + framepos_t const rp = _region->region()->position (); + + /* prevent the note being dragged earlier than the region's position */ + st = max (st, rp); /* snap and return corresponding delta */ - return _region->snap_frame_to_frame (st) - n; + return _region->snap_frame_to_frame (st - rp) + rp - n; } -/** @return Current total drag y change in notes */ +/** @return Current total drag y change in note number */ int8_t NoteDrag::total_dy () const { - /* this is `backwards' to make increasing note number go in the right direction */ - double const dy = _drags->current_pointer_y() - grab_y(); - - /* dy in notes */ - int8_t ndy = 0; - - if (abs (dy) >= _note_height) { - if (dy > 0) { - ndy = (int8_t) ceil (dy / _note_height / 2.0); - } else { - ndy = (int8_t) floor (dy / _note_height / 2.0); - } - } - - /* more positive value = higher pitch and higher y-axis position on track, - which is the inverse of the X-centric geometric universe - */ - - return -ndy; -} + return ((int8_t) (grab_y() / _note_height)) - ((int8_t) (_drags->current_pointer_y() / _note_height)); +} void NoteDrag::motion (GdkEvent *, bool) { /* Total change in x and y since the start of the drag */ frameoffset_t const dx = total_dx (); - int8_t const dy = -total_dy (); + int8_t const dy = total_dy (); /* Now work out what we have to do to the note canvas items to set this new drag delta */ double const tdx = _editor->frame_to_unit (dx) - _cumulative_dx; - double const tdy = dy * _note_height - _cumulative_dy; + double const tdy = -dy * _note_height - _cumulative_dy; if (tdx || tdy) { _cumulative_dx += tdx; _cumulative_dy += tdy; - int8_t note_delta = total_dy(); + int8_t note_delta = total_dy(); _region->move_selection (tdx, tdy, note_delta); - char buf[12]; - snprintf (buf, sizeof (buf), "%s (%d)", Evoral::midi_note_name (_primary->note()->note() + note_delta).c_str(), - (int) floor (_primary->note()->note() + note_delta)); - - _editor->show_verbose_canvas_cursor_with (buf); - } + /* the new note value may be the same as the old one, but we + * don't know what that means because the selection may have + * involved more than one note and we might be doing something + * odd with them. so show the note value anyway, always. + */ + + char buf[12]; + uint8_t new_note = min (max (_primary->note()->note() + note_delta, 0), 127); + + snprintf (buf, sizeof (buf), "%s (%d)", Evoral::midi_note_name (new_note).c_str(), + (int) floor (new_note)); + + show_verbose_cursor_text (buf); + } } void @@ -3806,7 +4026,7 @@ NoteDrag::finished (GdkEvent* ev, bool moved) } void -NoteDrag::aborted () +NoteDrag::aborted (bool) { /* XXX: TODO */ } @@ -3817,7 +4037,7 @@ AutomationRangeDrag::AutomationRangeDrag (Editor* editor, ArdourCanvas::Item* it , _nothing_to_drag (false) { DEBUG_TRACE (DEBUG::Drags, "New AutomationRangeDrag\n"); - + _atav = reinterpret_cast (_item->get_data ("trackview")); assert (_atav); @@ -3875,13 +4095,13 @@ AutomationRangeDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) i->points.push_back (i->line->nth (j)); } } - + } else { for (list::const_iterator i = _ranges.begin(); i != _ranges.end(); ++i) { framecnt_t const half = (i->start + i->end) / 2; - + /* find the line that this audio range starts in */ list::iterator j = _lines.begin(); while (j != _lines.end() && (j->range.first > i->start || j->range.second < i->start)) { @@ -3890,7 +4110,7 @@ AutomationRangeDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) if (j != _lines.end()) { boost::shared_ptr the_list = j->line->the_list (); - + /* j is the line that this audio range starts in; fade into it; 64 samples length plucked out of thin air. */ @@ -3910,7 +4130,7 @@ AutomationRangeDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) } /* same thing for the end */ - + j = _lines.begin(); while (j != _lines.end() && (j->range.first > i->end || j->range.second < i->end)) { ++j; @@ -3918,11 +4138,11 @@ AutomationRangeDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) if (j != _lines.end()) { boost::shared_ptr the_list = j->line->the_list (); - + /* j is the line that this audio range starts in; fade out of it; 64 samples length plucked out of thin air. */ - + framepos_t b = i->end - 64; if (b < half) { b = half; @@ -3930,7 +4150,7 @@ AutomationRangeDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) double const p = j->line->time_converter().from (b - j->line->time_converter().origin_b ()); double const q = j->line->time_converter().from (i->end - j->line->time_converter().origin_b ()); - + the_list->add (p, the_list->eval (p)); j->line->add_always_in_view (p); the_list->add (q, the_list->eval (q)); @@ -3998,7 +4218,7 @@ AutomationRangeDrag::finished (GdkEvent* event, bool) if (_nothing_to_drag) { return; } - + motion (event, false); for (list::iterator i = _lines.begin(); i != _lines.end(); ++i) { i->line->end_drag (); @@ -4009,7 +4229,7 @@ AutomationRangeDrag::finished (GdkEvent* event, bool) } void -AutomationRangeDrag::aborted () +AutomationRangeDrag::aborted (bool) { for (list::iterator i = _lines.begin(); i != _lines.end(); ++i) { i->line->clear_always_in_view (); @@ -4027,3 +4247,229 @@ DraggingView::DraggingView (RegionView* v, RegionDrag* parent) initial_position = v->region()->position (); initial_end = v->region()->position () + v->region()->length (); } + +PatchChangeDrag::PatchChangeDrag (Editor* e, CanvasPatchChange* i, MidiRegionView* r) + : Drag (e, i) + , _region_view (r) + , _patch_change (i) + , _cumulative_dx (0) +{ + DEBUG_TRACE (DEBUG::Drags, "New PatchChangeDrag\n"); +} + +void +PatchChangeDrag::motion (GdkEvent* ev, bool) +{ + framepos_t f = adjusted_current_frame (ev); + boost::shared_ptr r = _region_view->region (); + f = max (f, r->position ()); + f = min (f, r->last_frame ()); + + framecnt_t const dxf = f - grab_frame(); + double const dxu = _editor->frame_to_unit (dxf); + _patch_change->move (dxu - _cumulative_dx, 0); + _cumulative_dx = dxu; +} + +void +PatchChangeDrag::finished (GdkEvent* ev, bool movement_occurred) +{ + if (!movement_occurred) { + return; + } + + boost::shared_ptr r (_region_view->region ()); + + framepos_t f = adjusted_current_frame (ev); + f = max (f, r->position ()); + f = min (f, r->last_frame ()); + + _region_view->move_patch_change ( + *_patch_change, + _region_view->region_frames_to_region_beats (f - r->position() - r->start()) + ); +} + +void +PatchChangeDrag::aborted (bool) +{ + _patch_change->move (-_cumulative_dx, 0); +} + +void +PatchChangeDrag::setup_pointer_frame_offset () +{ + boost::shared_ptr region = _region_view->region (); + _pointer_frame_offset = raw_grab_frame() - _region_view->source_beats_to_absolute_frames (_patch_change->patch()->time()); +} + +MidiRubberbandSelectDrag::MidiRubberbandSelectDrag (Editor* e, MidiRegionView* rv) + : RubberbandSelectDrag (e, rv->get_canvas_frame ()) + , _region_view (rv) +{ + +} + +void +MidiRubberbandSelectDrag::select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool drag_in_progress) +{ + framepos_t const p = _region_view->region()->position (); + double const y = _region_view->midi_view()->y_position (); + + x1 = max ((framepos_t) 0, x1 - p); + x2 = max ((framepos_t) 0, x2 - p); + y1 = max (0.0, y1 - y); + y2 = max (0.0, y2 - y); + + _region_view->update_drag_selection ( + _editor->frame_to_pixel (x1), + _editor->frame_to_pixel (x2), + y1, + y2, + Keyboard::modifier_state_contains (button_state, Keyboard::TertiaryModifier) + ); +} + +void +MidiRubberbandSelectDrag::deselect_things () +{ + /* XXX */ +} + +EditorRubberbandSelectDrag::EditorRubberbandSelectDrag (Editor* e, ArdourCanvas::Item* i) + : RubberbandSelectDrag (e, i) +{ + +} + +void +EditorRubberbandSelectDrag::select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool drag_in_progress) +{ + if (drag_in_progress) { + /* We just want to select things at the end of the drag, not during it */ + return; + } + + Selection::Operation op = ArdourKeyboard::selection_type (button_state); + + _editor->begin_reversible_command (_("rubberband selection")); + _editor->select_all_within (x1, x2 - 1, y1, y2, _editor->track_views, op, false); + _editor->commit_reversible_command (); +} + +void +EditorRubberbandSelectDrag::deselect_things () +{ + if (!getenv("ARDOUR_SAE")) { + _editor->selection->clear_tracks(); + } + _editor->selection->clear_regions(); + _editor->selection->clear_points (); + _editor->selection->clear_lines (); +} + +NoteCreateDrag::NoteCreateDrag (Editor* e, ArdourCanvas::Item* i, MidiRegionView* rv) + : Drag (e, i) + , _region_view (rv) + , _drag_rect (0) +{ + +} + +NoteCreateDrag::~NoteCreateDrag () +{ + delete _drag_rect; +} + +framecnt_t +NoteCreateDrag::grid_frames (framepos_t t) const +{ + bool success; + Evoral::MusicalTime grid_beats = _editor->get_grid_type_as_beats (success, t); + if (!success) { + grid_beats = 1; + } + + return _region_view->region_beats_to_region_frames (grid_beats); +} + +void +NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) +{ + Drag::start_grab (event, cursor); + + _drag_rect = new ArdourCanvas::SimpleRect (*_region_view->get_canvas_group ()); + + framepos_t pf = _drags->current_pointer_frame (); + framecnt_t const g = grid_frames (pf); + + /* Hack so that we always snap to the note that we are over, instead of snapping + to the next one if we're more than halfway through the one we're over. + */ + if (_editor->snap_mode() == SnapNormal && pf > g / 2) { + pf -= g / 2; + } + + _note[0] = adjusted_frame (pf, event) - _region_view->region()->position (); + + MidiStreamView* sv = _region_view->midi_stream_view (); + double const x = _editor->frame_to_pixel (_note[0]); + double const y = sv->note_to_y (sv->y_to_note (y_to_region (event->button.y))); + + _drag_rect->property_x1() = x; + _drag_rect->property_y1() = y; + _drag_rect->property_x2() = x; + _drag_rect->property_y2() = y + floor (_region_view->midi_stream_view()->note_height ()); + + _drag_rect->property_outline_what() = 0xff; + _drag_rect->property_outline_color_rgba() = 0xffffff99; + _drag_rect->property_fill_color_rgba() = 0xffffff66; +} + +void +NoteCreateDrag::motion (GdkEvent* event, bool) +{ + _note[1] = adjusted_current_frame (event) - _region_view->region()->position (); + double const x = _editor->frame_to_pixel (_note[1]); + if (_note[1] > _note[0]) { + _drag_rect->property_x2() = x; + } else { + _drag_rect->property_x1() = x; + } +} + +void +NoteCreateDrag::finished (GdkEvent* event, bool had_movement) +{ + if (!had_movement) { + return; + } + + framepos_t const start = min (_note[0], _note[1]); + framecnt_t length = abs (_note[0] - _note[1]); + + framecnt_t const g = grid_frames (start); + double const one_tick = 1 / Timecode::BBT_Time::ticks_per_beat; + + if (_editor->snap_mode() == SnapNormal && length < g) { + length = g - one_tick; + } + + double const length_beats = max (one_tick, _region_view->region_frames_to_region_beats (length)); + + _region_view->create_note_at (start, _drag_rect->property_y1(), length_beats, false); +} + +double +NoteCreateDrag::y_to_region (double y) const +{ + double x = 0; + _region_view->get_canvas_group()->w2i (x, y); + return y; +} + +void +NoteCreateDrag::aborted (bool) +{ + +}