X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fedit.C;h=2575cfa359facc94c5b96a01544b57a30c7ccc93;hb=0983c78067d86d25426fd34655ad9a9992ef04c7;hp=0ede9b9ef2a34acfc7dc22f38bcb52771b469055;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C index 0ede9b9e..2575cfa3 100644 --- a/cinelerra-5.1/cinelerra/edit.C +++ b/cinelerra-5.1/cinelerra/edit.C @@ -150,6 +150,9 @@ int Edit::copy(int64_t start, file->tag.set_title("NESTED_EDL"); file->tag.set_property("SRC", nested_edl->path); file->append_tag(); + file->tag.set_title("/NESTED_EDL"); + file->append_tag(); + file->append_newline(); } if(asset) @@ -213,10 +216,8 @@ int64_t Edit::get_source_end(int64_t default_) void Edit::insert_transition(char *title) { //printf("Edit::insert_transition this=%p title=%p title=%s\n", this, title, title); - detach_transition(); - transition = new Transition(edl, - this, - title, + delete transition; + transition = new Transition(edl, this, title, track->to_units(edl->session->default_transition_length, 1)); } @@ -228,10 +229,7 @@ void Edit::detach_transition() int Edit::silence() { - if(asset || nested_edl) - return 0; - else - return 1; + return asset || nested_edl ? 0 : 1; }