X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftracksedit.C;h=d97800ce9a750458f694fde3d8bef4fa304eda2f;hb=9a7a880b549aed850fd3c29abb152d69a94e23f8;hp=b80a8887a0781200864511b60d1a9eb8f88d8ac9;hpb=e23393f4ff9f772ac8f47926cf490dc87a630ed4;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/tracksedit.C b/cinelerra-5.1/cinelerra/tracksedit.C index b80a8887..d97800ce 100644 --- a/cinelerra-5.1/cinelerra/tracksedit.C +++ b/cinelerra-5.1/cinelerra/tracksedit.C @@ -208,7 +208,8 @@ void Tracks::set_edit_length(double start, double end, double length) int64_t length_units = current_track->to_units(end_time, 0) - total_units; if(length_units < 1) length_units = 1; -printf("Tracks::set_edit_length %d %f %f\n", __LINE__, end_time, current_track->from_units(total_units)); +//printf("Tracks::set_edit_length %d %f %f\n", __LINE__, +// end_time, current_track->from_units(total_units)); total_units += length_units; // Go in using the edit handle interface @@ -740,13 +741,15 @@ void Tracks::move_edits(ArrayList *edits, } } -void Tracks::move_group(EDL *group, Track *first_track, double position) +void Tracks::move_group(EDL *group, Track *first_track, double position, int overwrite) { for( Track *track=first; track; track=track->next ) { if( !track->record ) continue; for( Edit *edit=track->edits->first; edit; edit=edit->next ) { if( !edit->is_selected ) continue; - edit->mute(); edit->is_selected = 0; + edit->mute(); + edit->is_selected = 0; + edit->group_id = 0; } } Track *src = group->tracks->first; @@ -757,7 +760,8 @@ void Tracks::move_group(EDL *group, Track *first_track, double position) if( edit->silence() ) continue; int64_t start = pos + edit->startproject; int64_t end = start + edit->length; - track->edits->clear(start, end); + if( overwrite ) + track->edits->clear(start, end); Edit *dst = track->edits->insert_new_edit(start); dst->copy_from(edit); dst->startproject = start;