projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ffmpeg versioning mods from Andrew
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
auto.C
diff --git
a/cinelerra-5.1/cinelerra/auto.C
b/cinelerra-5.1/cinelerra/auto.C
index 03d4aa016eb5d72b67122f79554e0f9ae8aad314..87a2ddafe08d4b58bff46f224b40811892ecf1ed 100644
(file)
--- a/
cinelerra-5.1/cinelerra/auto.C
+++ b/
cinelerra-5.1/cinelerra/auto.C
@@
-69,7
+69,7
@@
void Auto::copy(int64_t start, int64_t end, FileXML *file, int default_only)
void Auto::copy_from(Auto *that)
{
void Auto::copy_from(Auto *that)
{
- this->orig_id = orig_id;
+ this->orig_id =
that->
orig_id;
this->position = that->position;
}
this->position = that->position;
}
@@
-79,8
+79,11
@@
int Auto::interpolate_from(Auto *a1, Auto *a2, int64_t new_position, Auto *templ
if( !templ ) templ = previous;
if( !templ && this->autos )
templ = this->autos->default_auto;
if( !templ ) templ = previous;
if( !templ && this->autos )
templ = this->autos->default_auto;
- if( templ )
+ if( templ ) {
+ int orig_id = this->orig_id;
copy_from(templ);
copy_from(templ);
+ this->orig_id = orig_id;
+ }
position = new_position;
return 0;
}
position = new_position;
return 0;
}