X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;fp=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=b59c2bdf85c56303fc618b52f2f4ddd270ba227d;hp=c34513d3add94843c33a3f2fa755882424e5b020;hb=0495d0555cc8e2526b7e3677fb7ef4d802f5ebe2;hpb=6050493632cb3681227b7ec8c12decd449dcf66f diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C index c34513d3..b59c2bdf 100644 --- a/cinelerra-5.1/cinelerra/mwindowedit.C +++ b/cinelerra-5.1/cinelerra/mwindowedit.C @@ -1872,22 +1872,19 @@ int MWindow::paste_edls(ArrayList *new_edls, int load_mode, edl->add_clip(new_edl); break; } -//PRINT_TRACE // Insert edl if( load_mode != LOADMODE_RESOURCESONLY && load_mode != LOADMODE_ASSETSONLY ) { // Insert labels - if( edl->session->labels_follow_edits ) { -//printf("MWindow::paste_edls %f %f\n", current_position, edl_length); + if( edit_labels ) { if( load_mode == LOADMODE_PASTE || load_mode == LOADMODE_NESTED ) edl->labels->insert_labels(new_edl->labels, destination_tracks.total ? paste_position[0] : 0.0, - edl_length, edit_labels); + edl_length, 1); else edl->labels->insert_labels(new_edl->labels, current_position, - edl_length, edit_labels); + edl_length, 1); } -//PRINT_TRACE double total_length = new_edl->tracks->total_length(); for( Track *new_track=new_edl->tracks->first; new_track; new_track=new_track->next ) {