ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

completely remove RegionRippleDrag, and merge Editor::add_region(_copy,}_drag() into one method

This commit is contained in:
Paul Davis 2021-06-04 09:22:44 -06:00
parent 9d54bb08e7
commit 0c77a35178
4 changed files with 59 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor.h
View File

@ -1615,9 +1615,8 @@ private:
gint mouse_rename_region (ArdourCanvas::Item*, GdkEvent*);
void add_region_drag (ArdourCanvas::Item*, GdkEvent*, RegionView*);
void add_region_drag (ArdourCanvas::Item*, GdkEvent*, RegionView*, bool copy);
void start_create_region_grab (ArdourCanvas::Item*, GdkEvent*);
void add_region_copy_drag (ArdourCanvas::Item*, GdkEvent*, RegionView*);
void add_region_brush_drag (ArdourCanvas::Item*, GdkEvent*, RegionView*);
void start_selection_grab (ArdourCanvas::Item*, GdkEvent*);
@ -2395,7 +2394,6 @@ private:
friend class RegionCutDrag;
friend class RegionDrag;
friend class RegionMoveDrag;
friend class RegionRippleDrag;
friend class TrimDrag;
friend class BBTRulerDrag;
friend class MeterMarkerDrag;

208
gtk2_ardour/editor_drag.cc
View File

@ -998,6 +998,50 @@ struct DraggingViewSorter {
}
};
void
RegionMotionDrag::collect_ripple_views ()
{
// also add regions before start of selection to exclude, to be consistent with how Mixbus does ripple
RegionSelection copy;
_editor->selection->regions.by_position (copy); // get selected regions sorted by position into copy
std::set<boost::shared_ptr<ARDOUR::Playlist> > playlists = copy.playlists();
std::set<boost::shared_ptr<ARDOUR::Playlist> >::const_iterator pi;
for (pi = playlists.begin(); pi != playlists.end(); ++pi) {
// find ripple start point on each applicable playlist
RegionView *first_selected_on_this_track = NULL;
for (RegionSelection::iterator i = copy.begin(); i != copy.end(); ++i) {
if ((*i)->region()->playlist() == (*pi)) {
// region is on this playlist - it's the first, because they're sorted
first_selected_on_this_track = *i;
break;
}
}
assert (first_selected_on_this_track); // we should always find the region in one of the playlists...
const samplepos_t where = first_selected_on_this_track->region()->position();
TimeAxisView* tav = &first_selected_on_this_track->get_time_axis_view();
boost::shared_ptr<RegionList> rl = (*pi)->regions_with_start_within (Evoral::Range<samplepos_t>(where, max_samplepos));
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(tav);
RegionSelection to_ripple;
for (RegionList::iterator i = rl->begin(); i != rl->end(); ++i) {
if ((*i)->position() >= where) {
to_ripple.push_back (rtv->view()->find_view(*i));
}
}
for (RegionSelection::reverse_iterator i = to_ripple.rbegin(); i != to_ripple.rend(); ++i) {
if (!_editor->selection->regions.contains (*i)) {
_views.push_back (DraggingView (*i, this, tav));
}
}
}
}
void
RegionMotionDrag::motion (GdkEvent* event, bool first_move)
{
@ -1222,8 +1266,8 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move)
#endif
}
if (first_move) {
collect_views ();
if (first_move && _editor->should_ripple()) {
collect_ripple_views ();
}
for (list<DraggingView>::iterator i = _views.begin(); i != _views.end(); ++i) {
@ -2031,7 +2075,9 @@ RegionMoveDrag::remove_region_from_playlist (
playlist->clear_changes ();
}
playlist->remove_region (region); // should be no need to ripple; we better already have rippled the playlist in RegionRippleDrag
/* XX NEED TO RIPPLE */
playlist->remove_region (region);
}
@ -2209,162 +2255,6 @@ RegionInsertDrag::aborted (bool)
_views.clear ();
}
RegionSpliceDrag::RegionSpliceDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<RegionView*> const & v)
: RegionMoveDrag (e, i, p, v, false)
{
DEBUG_TRACE (DEBUG::Drags, "New RegionSpliceDrag\n");
}
struct RegionSelectionByPosition {
bool operator() (RegionView*a, RegionView* b) {
return a->region()->position () < b->region()->position();
}
};
void
RegionSpliceDrag::motion (GdkEvent* event, bool)
{
/* Which trackview is this ? */
pair<TimeAxisView*, double> const tvp = _editor->trackview_by_y_position (current_pointer_y ());
RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*> (tvp.first);
/* The region motion is only processed if the pointer is over
an audio track.
*/
if (!tv || !tv->is_track()) {
/* To make sure we hide the verbose canvas cursor when the mouse is
not held over an audio track.
*/
_editor->verbose_cursor()->hide ();
return;
} else {
_editor->verbose_cursor()->show ();
}
int dir;
if ((_drags->current_pointer_x() - last_pointer_x()) > 0) {
dir = 1;
} else {
dir = -1;
}
RegionSelection copy;
_editor->selection->regions.by_position(copy);
samplepos_t const pf = adjusted_current_sample (event);
for (RegionSelection::iterator i = copy.begin(); i != copy.end(); ++i) {
RouteTimeAxisView* atv = dynamic_cast<RouteTimeAxisView*> (&(*i)->get_time_axis_view());
if (!atv) {
continue;
}
boost::shared_ptr<Playlist> playlist;
if ((playlist = atv->playlist()) == 0) {
continue;
}
if (!playlist->region_is_shuffle_constrained ((*i)->region())) {
continue;
}
if (dir > 0) {
if (pf < (*i)->region()->last_sample() + 1) {
continue;
}
} else {
if (pf > (*i)->region()->first_sample()) {
continue;
}
}
playlist->shuffle ((*i)->region(), dir);
}
}
void
RegionSpliceDrag::finished (GdkEvent* event, bool movement_occurred)
{
RegionMoveDrag::finished (event, movement_occurred);
}
void
RegionSpliceDrag::aborted (bool)
{
/* XXX: TODO */
}
/***
* ripple mode...
* very similar to a regular region move drag, except that on first move we
* collect all regionviews after the selected regions on appropriate playlists
* and visually drag them too.
*/
bool
RegionRippleDrag::y_movement_allowed (int delta_track, double delta_layer, int skip_invisible) const
{
return false;
}
RegionRippleDrag::RegionRippleDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<RegionView*> const & v, bool copy)
: RegionMoveDrag (e, i, p, v, false, copy)
{
DEBUG_TRACE (DEBUG::Drags, "New RegionRippleDrag\n");
}
void
RegionRippleDrag::collect_views ()
{
// also add regions before start of selection to exclude, to be consistent with how Mixbus does ripple
RegionSelection copy;
_editor->selection->regions.by_position (copy); // get selected regions sorted by position into copy
std::set<boost::shared_ptr<ARDOUR::Playlist> > playlists = copy.playlists();
std::set<boost::shared_ptr<ARDOUR::Playlist> >::const_iterator pi;
for (pi = playlists.begin(); pi != playlists.end(); ++pi) {
// find ripple start point on each applicable playlist
RegionView *first_selected_on_this_track = NULL;
for (RegionSelection::iterator i = copy.begin(); i != copy.end(); ++i) {
if ((*i)->region()->playlist() == (*pi)) {
// region is on this playlist - it's the first, because they're sorted
first_selected_on_this_track = *i;
break;
}
}
assert (first_selected_on_this_track); // we should always find the region in one of the playlists...
const samplepos_t where = first_selected_on_this_track->region()->position();
TimeAxisView* tav = &first_selected_on_this_track->get_time_axis_view();
boost::shared_ptr<RegionList> rl = (*pi)->regions_with_start_within (Evoral::Range<samplepos_t>(where, max_samplepos));
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(tav);
RegionSelection to_ripple;
for (RegionList::iterator i = rl->begin(); i != rl->end(); ++i) {
if ((*i)->position() >= where) {
to_ripple.push_back (rtv->view()->find_view(*i));
}
}
for (RegionSelection::reverse_iterator i = to_ripple.rbegin(); i != to_ripple.rend(); ++i) {
if (!_editor->selection->regions.contains (*i)) {
_views.push_back (DraggingView (*i, this, tav));
}
}
}
}
RegionCreateDrag::RegionCreateDrag (Editor* e, ArdourCanvas::Item* i, TimeAxisView* v)
: Drag (e, i),
_view (dynamic_cast<MidiTimeAxisView*> (v))

18
gtk2_ardour/editor_drag.h
View File

@ -418,8 +418,6 @@ public:
virtual void finished (GdkEvent *, bool);
virtual void aborted (bool);
virtual void collect_views () {}
/** @return true if the regions being `moved' came from somewhere on the canvas;
* false if they came from outside (e.g. from the region list).
*/
@ -429,12 +427,14 @@ protected:
double compute_x_delta (GdkEvent const *, ARDOUR::MusicSample *);
virtual bool y_movement_allowed (int, double, int skip_invisible = 0) const;
void collect_ripple_views ();
bool _ignore_video_lock;
ARDOUR::MusicSample _last_position; ///< last position of the thing being dragged
double _total_x_delta;
int _last_pointer_time_axis_view;
double _last_pointer_layer;
private:
uint32_t _ndropzone;
uint32_t _pdropzone;
@ -524,20 +524,6 @@ public:
}
};
/** Region drag in ripple mode */
class RegionRippleDrag : public RegionMoveDrag
{
public:
RegionRippleDrag (Editor *, ArdourCanvas::Item *, RegionView *, std::list<RegionView*> const &, bool copy);
void collect_views ();
protected:
bool y_movement_allowed (int delta_track, double delta_layer, int skip_invisible = 0) const;
};
/** "Drag" to cut a region (action only on button release) */
class RegionCutDrag : public Drag
{
public:

36
gtk2_ardour/editor_mouse.cc
View File

@ -1061,16 +1061,17 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
}
/* click on a normal region view */
if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::slip_contents_modifier ())) {
if (!clicked_regionview->region()->locked() && (Config->get_edit_mode() != Lock)) {
_drags->add (new RegionSlipContentsDrag (this, item, clicked_regionview, selection->regions.by_layer()));
}
} else if (ArdourKeyboard::indicates_copy (event->button.state)) {
add_region_copy_drag (item, event, clicked_regionview);
add_region_copy_drag (item, event, clicked_regionview, true);
} else if (Keyboard::the_keyboard().key_is_down (GDK_b)) {
add_region_brush_drag (item, event, clicked_regionview);
} else {
add_region_drag (item, event, clicked_regionview);
add_region_drag (item, event, clicked_regionview, false);
}
@ -1332,9 +1333,9 @@ Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
switch (item_type) {
case RegionItem:
if (ArdourKeyboard::indicates_copy (event->button.state)) {
add_region_copy_drag (item, event, clicked_regionview);
add_region_drag (item, event, clicked_regionview, true);
} else {
add_region_drag (item, event, clicked_regionview);
add_region_drag (item, event, clicked_regionview, false);
}
_drags->start_grab (event);
return true;
@ -2570,7 +2571,7 @@ Editor::track_height_step_timeout ()
}
void
Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view)
Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view, bool copy)
{
assert (region_view);
@ -2586,30 +2587,7 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region
_drags->add (new RegionRippleDrag (this, item, region_view, selection->regions.by_layer(), false));
break;
default:
_drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false));
break;
}
}
void
Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view)
{
assert (region_view);
if (!region_view->region()->playlist()) {
return;
}
switch (Config->get_edit_mode()) {
case Lock:
return;
case Ripple:
case RippleAll:
_drags->add (new RegionRippleDrag (this, item, region_view, selection->regions.by_layer(), true));
break;
default:
_drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false, true));
_drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false, copy));
break;
}
}