#include "playbackconfig.h"
#include "playabletracks.h"
#include "plugin.h"
+#include "pluginset.h"
#include "preferences.h"
#include "recordconfig.h"
#include "recordlabel.h"
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);
for( int i=0; i<edits->size(); ++i ) {
Edit *edit = edits->get(i);
Track *track = edit->track;
int64_t start = edit->startproject;
- int end = start + edit->length;
- track->clear(start, end, 1, 0,
- session->plugins_follow_edits,
- session->autos_follow_edits, 0);
- if( !collapse )
- track->paste_silence(start, end,
- session->plugins_follow_edits,
- session->autos_follow_edits);
+ int64_t length = edit->length;
+ int64_t end = start + length;
+ if( session->autos_follow_edits ) {
+ track->automation->clear(start, end, 0, collapse);
+ }
+ if( session->plugins_follow_edits ) {
+ for( int k=0; k<track->plugin_set.size(); ++k ) {
+ PluginSet *plugin_set = track->plugin_set[k];
+ plugin_set->clear(start, end, 1);
+ if( !collapse )
+ plugin_set->paste_silence(start, end);
+ }
+ }
+ Edit *dead_edit = edit;
+ if( collapse ) {
+ while( (edit=edit->next) )
+ edit->startproject -= length;
+ }
+ delete dead_edit;
+ track->optimize();
}
optimize();
}
}
}
-// aligned frame time
+// aligned frame time, account for sample truncation
double EDL::frame_align(double position, int round)
{
- double frame_pos = position * session->frame_rate;
- frame_pos = (int64_t)(frame_pos + (round ? 0.5 : 1e-6));
- position = frame_pos / session->frame_rate;
- return position;
+ if( !round && session->sample_rate > 0 ) {
+ int64_t sample_pos = position * session->sample_rate;
+ position = (sample_pos+2.) / session->sample_rate;
+ }
+ int64_t frame_pos = (position * session->frame_rate + (round ? 0.5 : 1e-6));
+ return frame_pos / session->frame_rate;
}
// Convert position to frames if alignment is enabled.