projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proxy bug fixes, add moveobj, sams icons, ladspa fixes, pot sigfpe
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
edl.C
diff --git
a/cinelerra-5.1/cinelerra/edl.C
b/cinelerra-5.1/cinelerra/edl.C
index 9e14b082d9c003af3c534cee3bff931f5718054b..5d9ff496238e1f15727fe154c333bf04ae015786 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edl.C
+++ b/
cinelerra-5.1/cinelerra/edl.C
@@
-301,8
+301,7
@@
int EDL::load_xml(FileXML *file,
else
if(file->tag.title_is("ASSETS"))
{
else
if(file->tag.title_is("ASSETS"))
{
- if((load_flags & LOAD_ASSETS) &&
- !parent_edl)
+ if(load_flags & LOAD_ASSETS)
assets->load(file, load_flags);
else
result = file->skip_tag();
assets->load(file, load_flags);
else
result = file->skip_tag();
@@
-610,14
+609,9
@@
int EDL::copy(double start,
// Media
// Don't replicate all assets for every clip.
// Media
// Don't replicate all assets for every clip.
-// The assets for the clips are probably in the mane EDL.
- if(!is_clip)
- copy_assets(start,
- end,
- file,
- all,
- output_path);
-
+// The assets for the clips are probably in the main EDL.
+ if( !is_clip )
+ copy_assets(start, end, file, all, output_path);
// Clips
// Don't want this if using clipboard
if(all)
// Clips
// Don't want this if using clipboard
if(all)
@@
-650,10
+644,9
@@
int EDL::copy(double start,
//printf("EDL::copy 2\n");
// terminate file
//printf("EDL::copy 2\n");
// terminate file
- if(
is_clip
)
+ if(
is_clip
)
file->tag.set_title("/CLIP_EDL");
file->tag.set_title("/CLIP_EDL");
- else
- if(is_vwindow)
+ else if( is_vwindow )
file->tag.set_title("/VWINDOW_EDL");
else
file->tag.set_title("/EDL");
file->tag.set_title("/VWINDOW_EDL");
else
file->tag.set_title("/EDL");