projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
preset edit button, intl fix, drag window tweak, empty keyframe edit fix
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
edit.C
diff --git
a/cinelerra-5.1/cinelerra/edit.C
b/cinelerra-5.1/cinelerra/edit.C
index b54da4f500ca81b7e877209cb1c1921d12322c70..d9f55ba74d546a89eaf3f756e595d82224237a78 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edit.C
+++ b/
cinelerra-5.1/cinelerra/edit.C
@@
-282,7
+282,7
@@
void Edit::equivalent_output(Edit *edit, int64_t *result)
!transition->identical(edit->transition)) ||
// Asset changed
(asset && edit->asset &&
!transition->identical(edit->transition)) ||
// Asset changed
(asset && edit->asset &&
- !asset->equivalent(*edit->asset, 1, 1)) ||
+ !asset->equivalent(*edit->asset, 1, 1
, edl
)) ||
// Nested EDL changed
(nested_edl && edit->nested_edl &&
strcmp(nested_edl->path, edit->nested_edl->path))
// Nested EDL changed
(nested_edl && edit->nested_edl &&
strcmp(nested_edl->path, edit->nested_edl->path))
@@
-713,13
+713,17
@@
int Edit::shift_end_out(int edit_mode,
next->startproject += cut_length;
next->startsource += cut_length;
next->length -= cut_length;
next->startproject += cut_length;
next->startsource += cut_length;
next->length -= cut_length;
-//printf("Edit::shift_end_out
2 %d\n"
, cut_length);
+//printf("Edit::shift_end_out
%d cut_length=%d\n", __LINE__
, cut_length);
}
else
{
}
else
{
+//printf("Edit::shift_end_out %d cut_length=%d next->length=%d\n", __LINE__, cut_length, next->length);
cut_length = next->length;
cut_length = next->length;
+ next->startproject += next->length;
+ next->startsource += next->length;
next->length = 0;
length += cut_length;
next->length = 0;
length += cut_length;
+//track->dump();
}
}
else
}
}
else