return 0;
}
+static int dead_edit_cmp(Edit**ap, Edit**bp)
+{
+ Edit *a = *ap, *b = *bp;
+ if( a->track != b->track ) return 0;
+ return a->startproject > b->startproject ? -1 : 1;
+}
+
void EDL::delete_edits(ArrayList<Edit*> *edits, int collapse)
{
+ edits->sort(dead_edit_cmp);
if( session->labels_follow_edits )
delete_edit_labels(edits, collapse);
- typedef struct { Track *track; int64_t start, end; } Zone;
- ArrayList<Zone> zones;
for( int i=0; i<edits->size(); ++i ) {
Edit *edit = edits->get(i);
Track *track = edit->track;
int64_t start = edit->startproject;
- int64_t end = start + edit->length;
- Zone &zone = zones.append();
- zone.track = track; zone.start = start; zone.end = end;
+ int64_t length = edit->length;
+ int64_t end = start + length;
if( session->autos_follow_edits ) {
track->automation->clear(start, end, 0, collapse);
}
plugin_set->paste_silence(start, end);
}
}
- track->optimize();
- }
- for( int i=0; i<zones.size(); ++i ) {
- Zone &zone = zones[i];
- Track *track = zone.track;
- int64_t start = zone.start, end = zone.end;
- track->edits->clear(start, end);
- if( !collapse )
- track->edits->paste_silence(start, end);
- track->optimize();
+ Edit *dead_edit = edit;
+ if( collapse ) {
+ while( (edit=edit->next) )
+ edit->startproject -= length;
+ }
+ delete dead_edit;
}
- optimize();
+// optimize edits only.
+// full optimize deletes pluginsets, mistargeting drag and drop
+ for( Track *track=tracks->first; track; track=track->next )
+ track->edits->optimize();
}
class Range {
}
-void EDL::modify_edithandles(double oldposition,
- double newposition,
- int currentend,
- int handle_mode,
- int edit_labels,
- int edit_plugins,
- int edit_autos)
+void EDL::modify_edithandles(double oldposition, double newposition,
+ int currentend, int handle_mode, int edit_labels,
+ int edit_plugins, int edit_autos, int group_id)
{
- tracks->modify_edithandles(oldposition,
- newposition,
- currentend,
- handle_mode,
- edit_labels,
- edit_plugins,
- edit_autos);
- labels->modify_handles(oldposition,
- newposition,
- currentend,
- handle_mode,
- edit_labels);
-}
-
-void EDL::modify_pluginhandles(double oldposition,
- double newposition,
- int currentend,
- int handle_mode,
- int edit_labels,
- int edit_autos,
- Edits *trim_edits)
-{
- tracks->modify_pluginhandles(oldposition,
- newposition,
- currentend,
- handle_mode,
- edit_labels,
- edit_autos,
- trim_edits);
+ tracks->modify_edithandles(oldposition, newposition,
+ currentend, handle_mode, edit_labels,
+ edit_plugins, edit_autos, group_id);
+ labels->modify_handles(oldposition, newposition,
+ currentend, handle_mode, edit_labels);
+}
+
+void EDL::modify_pluginhandles(double oldposition, double newposition,
+ int currentend, int handle_mode, int edit_labels,
+ int edit_autos, Edits *trim_edits)
+{
+ tracks->modify_pluginhandles(oldposition, newposition,
+ currentend, handle_mode, edit_labels,
+ edit_autos, trim_edits);
optimize();
}
-void EDL::paste_silence(double start,
- double end,
- int edit_labels,
- int edit_plugins,
- int edit_autos)
+void EDL::paste_silence(double start, double end,
+ int edit_labels, int edit_plugins, int edit_autos)
{
if( edit_labels )
labels->paste_silence(start, end);
- tracks->paste_silence(start,
- end,
- edit_plugins,
- edit_autos);
+ tracks->paste_silence(start, end, edit_plugins, edit_autos);
}