andrew file-exr/png/tiff mods, png add depth/compression, exr add b44-dwab, tiff...

[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 b46a4102d35b5abae035e4d3d2fdf1f710950c1c..d639106d1c3a8fb98d0d8abec89e72d52614d465 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -212,7 +212,7 @@ int EDL::read_xml(FileXML *file, uint32_t load_flags)
                                file->tag.title_is("/CLIP_EDL") ||
                                file->tag.title_is("/NESTED_EDL") ||
                                file->tag.title_is("/VWINDOW_EDL") ) {
-                               result = 1;
+                               break;
                        }
                        else
                        if( file->tag.title_is("CLIPBOARD") ) {
@@ -1925,7 +1925,7 @@ EDL *EDL::selected_edits_to_clip(int packed,
                        }
                        int64_t clip_start_pos = startproject;
                        Edit *clip_edit = new Edit(new_edl, new_track);
-                       clip_edit->copy_from(edit);
+                       clip_edit->clone_from(edit);
                        clip_edit->startproject = startproject;
                        startproject += clip_edit->length;
                        new_track->edits->append(clip_edit);
@@ -2055,7 +2055,7 @@ void EDL::paste_edits(EDL *clip, Track *first_track, double position, int overwr
                                if( overwrite )
                                        track->edits->clear(start, end);
                                Edit *dst = track->edits->insert_new_edit(start);
-                               dst->copy_from(edit);
+                               dst->clone_from(edit);
                                dst->startproject = start;
                                dst->is_selected = 1;
                                while( (dst=dst->next) != 0 )
@@ -2134,6 +2134,7 @@ void EDL::paste_edits(EDL *clip, Track *first_track, double position, int overwr
                                        Plugin *new_plugin = dst_plugin_set->insert_plugin(plugin->title,
                                                start, end-start, plugin->plugin_type, &plugin->shared_location,
                                                (KeyFrame*)plugin->keyframes->default_auto, 0);
+                                       new_plugin->on = plugin->on;
                                        KeyFrame *keyframe = (KeyFrame*)plugin->keyframes->first;
                                        for( ; keyframe; keyframe=(KeyFrame*)keyframe->next ) {
                                                int64_t keyframe_pos = pos + keyframe->position;