projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fast drag/drop rework, modify labels in mwin->cwin locks, mods to cut/paste, marks...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
edl.C
diff --git
a/cinelerra-5.1/cinelerra/edl.C
b/cinelerra-5.1/cinelerra/edl.C
index c7db139e642db5bc245721bd993313b54bea2960..d033b8d5377c00401f16be10989748eb12494041 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edl.C
+++ b/
cinelerra-5.1/cinelerra/edl.C
@@
-805,8
+805,6
@@
static int dead_edit_cmp(Edit**ap, Edit**bp)
void EDL::delete_edits(ArrayList<Edit*> *edits, int collapse)
{
edits->sort(dead_edit_cmp);
void EDL::delete_edits(ArrayList<Edit*> *edits, int collapse)
{
edits->sort(dead_edit_cmp);
- if( session->labels_follow_edits )
- delete_edit_labels(edits, collapse);
for( int i=0; i<edits->size(); ++i ) {
Edit *edit = edits->get(i);
Track *track = edit->track;
for( int i=0; i<edits->size(); ++i ) {
Edit *edit = edits->get(i);
Track *track = edit->track;
@@
-821,7
+819,8
@@
void EDL::delete_edits(ArrayList<Edit*> *edits, int collapse)
PluginSet *plugin_set = track->plugin_set[k];
plugin_set->clear(start, end, 1);
if( !collapse )
PluginSet *plugin_set = track->plugin_set[k];
plugin_set->clear(start, end, 1);
if( !collapse )
- plugin_set->paste_silence(start, end);
+ plugin_set->paste_silence(start, end, 1);
+ plugin_set->optimize();
}
}
Edit *dead_edit = edit;
}
}
Edit *dead_edit = edit;
@@
-830,11
+829,8
@@
void EDL::delete_edits(ArrayList<Edit*> *edits, int collapse)
edit->startproject -= length;
}
delete dead_edit;
edit->startproject -= length;
}
delete dead_edit;
- }
-// optimize edits only.
-// full optimize deletes pluginsets, mistargeting drag and drop
- for( Track *track=tracks->first; track; track=track->next )
track->edits->optimize();
track->edits->optimize();
+ }
}
class Range {
}
class Range {