Compare commits
2 Commits
9e5fb6ea40
...
85f640c31a
Author | SHA1 | Date |
---|---|---|
Ben Loftis | 85f640c31a | |
Ben Loftis | 904491611f |
|
@ -1028,14 +1028,21 @@ void
|
||||||
RegionMotionDrag::collect_ripple_views ()
|
RegionMotionDrag::collect_ripple_views ()
|
||||||
{
|
{
|
||||||
RegionSelection copy;
|
RegionSelection copy;
|
||||||
|
TrackViewList tracklist;
|
||||||
|
|
||||||
|
/* find all regions that we *might* ripple */
|
||||||
_editor->get_regionviews_at_or_after (_primary->region()->position(), copy);
|
_editor->get_regionviews_at_or_after (_primary->region()->position(), copy);
|
||||||
|
|
||||||
TimeAxisView *primary_tav = &_primary->get_time_axis_view();
|
/* if we aren't in ripple-all, find which tracks we will be rippling, based on the current region selection */
|
||||||
|
if (!_editor->should_ripple_all()) {
|
||||||
|
for (RegionSelection::iterator r = _editor->selection->regions.begin(); r != _editor->selection->regions.end(); ++r) {
|
||||||
|
tracklist.push_back (&(*r)->get_time_axis_view ());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (RegionSelection::reverse_iterator i = copy.rbegin(); i != copy.rend(); ++i) {
|
for (RegionSelection::reverse_iterator i = copy.rbegin(); i != copy.rend(); ++i) {
|
||||||
TimeAxisView *tav = &(*i)->get_time_axis_view();
|
TimeAxisView *tav = &(*i)->get_time_axis_view();
|
||||||
if (_editor->should_ripple_all() || tav == primary_tav) {
|
if (_editor->should_ripple_all() || tracklist.contains(tav)) {
|
||||||
if (!_editor->selection->regions.contains (*i)) {
|
if (!_editor->selection->regions.contains (*i)) {
|
||||||
_views.push_back (DraggingView (*i, this, &(*i)->get_time_axis_view()));
|
_views.push_back (DraggingView (*i, this, &(*i)->get_time_axis_view()));
|
||||||
}
|
}
|
||||||
|
|
|
@ -538,6 +538,9 @@ Editor::get_markers_to_ripple (boost::shared_ptr<Playlist> target_playlist, time
|
||||||
const timepos_t ripple_start = effective_ripple_mark_start (target_playlist, pos);
|
const timepos_t ripple_start = effective_ripple_mark_start (target_playlist, pos);
|
||||||
|
|
||||||
for (LocationMarkerMap::const_iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
|
for (LocationMarkerMap::const_iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
|
||||||
|
if ( i->first->is_session_range() || i->first->is_auto_punch() || i->first->is_auto_loop() ) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (i->first->start() >= ripple_start) {
|
if (i->first->start() >= ripple_start) {
|
||||||
cerr << "Add markers for " << i->first->name() << endl;
|
cerr << "Add markers for " << i->first->name() << endl;
|
||||||
markers.push_back (i->second->start);
|
markers.push_back (i->second->start);
|
||||||
|
|
Loading…
Reference in New Issue