projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix transition keyframe update when autogenerate keyframes set, revert copy operators...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
edit.C
diff --git
a/cinelerra-5.1/cinelerra/edit.C
b/cinelerra-5.1/cinelerra/edit.C
index f5a06bbf0dd54db600879661d7aa820acf93b6c6..56329af3caecc76d71c32c7092bad0429ee6e57c 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edit.C
+++ b/
cinelerra-5.1/cinelerra/edit.C
@@
-85,7
+85,6
@@
void Edit::reset()
channel = 0;
user_title[0] = 0;
nested_edl = 0;
channel = 0;
user_title[0] = 0;
nested_edl = 0;
- is_plugin = 0;
is_selected = 0;
hard_left = 0;
hard_right = 0;
is_selected = 0;
hard_left = 0;
hard_right = 0;
@@
-279,6
+278,12
@@
void Edit::copy_from(Edit *edit)
this->channel = edit->channel;
}
this->channel = edit->channel;
}
+void Edit::clone_from(Edit *edit)
+{
+ copy_from(edit);
+ edit->orig_id = edit->id;
+}
+
void Edit::equivalent_output(Edit *edit, int64_t *result)
{
// End of edit changed
void Edit::equivalent_output(Edit *edit, int64_t *result)
{
// End of edit changed
@@
-386,8
+391,8
@@
int Edit::picon_h()
int Edit::dump(FILE *fp)
{
fprintf(fp," EDIT %p\n", this); fflush(fp);
int Edit::dump(FILE *fp)
{
fprintf(fp," EDIT %p\n", this); fflush(fp);
- fprintf(fp," nested_edl=%p %s asset=%p %s\n",
- nested_edl, nested_edl ? nested_edl->path : "",
+ fprintf(fp,"
id %d, orig_id %d,
nested_edl=%p %s asset=%p %s\n",
+
id, orig_id,
nested_edl, nested_edl ? nested_edl->path : "",
asset, asset ? asset->path : "");
fflush(fp);
fprintf(fp," channel %d, color %08x, hard lt/rt %d/%d"
asset, asset ? asset->path : "");
fflush(fp);
fprintf(fp," channel %d, color %08x, hard lt/rt %d/%d"