projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for F_sine segv, bunch of intl fixes
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
track.C
diff --git
a/cinelerra-5.1/cinelerra/track.C
b/cinelerra-5.1/cinelerra/track.C
index 3dac186c178e6eeda45ff27f0f711f0408c9307e..f3852cf90e5bab5308e9383aeb29324dbb061a15 100644
(file)
--- a/
cinelerra-5.1/cinelerra/track.C
+++ b/
cinelerra-5.1/cinelerra/track.C
@@
-352,6
+352,8
@@
int Track::load(FileXML *file, int track_offset, uint32_t load_flags)
{
if(load_flags & LOAD_EDITS)
edits->load(file, track_offset);
{
if(load_flags & LOAD_EDITS)
edits->load(file, track_offset);
+ else
+ result = file->skip_tag();
}
else
if(file->tag.title_is("PLUGINSET"))
}
else
if(file->tag.title_is("PLUGINSET"))
@@
-372,6
+374,8
@@
int Track::load(FileXML *file, int track_offset, uint32_t load_flags)
current_plugin++;
}
}
current_plugin++;
}
}
+ else
+ result = file->skip_tag();
}
else
load_derived(file, load_flags);
}
else
load_derived(file, load_flags);
@@
-1146,17
+1150,9
@@
int Track::copy_assets(double start,
}
}
-
-
-
-int Track::clear(double start,
- double end,
- int edit_edits,
- int edit_labels,
- int edit_plugins,
- int edit_autos,
- int convert_units,
- Edits *trim_edits)
+int Track::clear(double start, double end,
+ int edit_edits, int edit_labels, int edit_plugins,
+ int edit_autos, int convert_units, Edits *trim_edits)
{
// Edits::move_auto calls this routine after the units are converted to the track
// format.
{
// Edits::move_auto calls this routine after the units are converted to the track
// format.