smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-14 02:26:39 +01:00
Code Issues Projects Releases Wiki Activity

Fix #8012 to some extent.

Browse source 
As soon as we ripple drag the selected region out of the original track,
::remove_unselected_from_views() is called and the rippled regions on the
original track are not covered when ::remove_selected_from_views() is called
again in ::finished(). Therefore we need to shift the regions remaining on the
original track back and forth again, in order to have them properly in the undo
history.
This commit is contained in:
Johannes Mueller 2020-04-14 21:41:57 +02:00
parent 07709b39c1
commit d2f5edf64f
2 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
gtk2_ardour/editor_drag.cc
View file

@ -2314,6 +2314,9 @@ RegionRippleDrag::RegionRippleDrag (Editor* e, ArdourCanvas::Item* i, RegionView
if (allow_moves_across_tracks) { if (allow_moves_across_tracks) {
orig_tav = &(*selected_regions.begin())->get_time_axis_view(); orig_tav = &(*selected_regions.begin())->get_time_axis_view();
for (std::list<DraggingView>::const_iterator it = _views.begin(); it != _views.end(); ++it) {
_orig_tav_ripples.push_back((*it).view->region());
}
} else { } else {
orig_tav = NULL; orig_tav = NULL;
} }
@ -2423,6 +2426,26 @@ RegionRippleDrag::finished (GdkEvent* event, bool movement_occurred)
orig_tav->playlist()->clear_changes(); orig_tav->playlist()->clear_changes();
orig_tav->playlist()->clear_owned_changes(); orig_tav->playlist()->clear_owned_changes();
remove_unselected_from_views (prev_amount, true); remove_unselected_from_views (prev_amount, true);
std::list<boost::shared_ptr<Region> >::const_iterator it = _orig_tav_ripples.begin();
for (; it != _orig_tav_ripples.end(); ++it) {
const boost::shared_ptr<Region> r = *it;
bool found = false;
for (std::list<DraggingView>::const_iterator it = _views.begin(); it != _views.end(); ++it) {
if (it->view->region() == r) {
found = true;
break;
}
}
if (!found) {
const samplecnt_t pos_after = r->position();
const samplecnt_t pos_before = pos_after + selection_length;
r->set_position(pos_before);
r->clear_changes();
r->set_position(pos_after);
}
}
vector<Command*> cmds; vector<Command*> cmds;
orig_tav->playlist()->rdiff (cmds); orig_tav->playlist()->rdiff (cmds);
_editor->session()->add_commands (cmds); _editor->session()->add_commands (cmds);

3
gtk2_ardour/editor_drag.h
View file

@ -44,6 +44,7 @@
namespace ARDOUR { namespace ARDOUR {
class Location; class Location;
class Region;
class TempoSection; class TempoSection;
} }
@ -520,6 +521,7 @@ private:
void add_all_after_to_views (TimeAxisView *tav, ARDOUR::samplepos_t where, const RegionSelection &exclude, bool drag_in_progress); void add_all_after_to_views (TimeAxisView *tav, ARDOUR::samplepos_t where, const RegionSelection &exclude, bool drag_in_progress);
void remove_unselected_from_views (ARDOUR::samplecnt_t amount, bool move_regions); void remove_unselected_from_views (ARDOUR::samplecnt_t amount, bool move_regions);
std::list<boost::shared_ptr<ARDOUR::Region> > _orig_tav_ripples;
}; };
/** "Drag" to cut a region (action only on button release) */ /** "Drag" to cut a region (action only on button release) */
@ -1328,4 +1330,3 @@ private:
}; };
#endif /* __gtk2_ardour_editor_drag_h_ */ #endif /* __gtk2_ardour_editor_drag_h_ */