projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more ffmpeg cmodel changes, listbox 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 0792fa443c5a3c179b1306c6f696c2f7e736b9eb..b54da4f500ca81b7e877209cb1c1921d12322c70 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edit.C
+++ b/
cinelerra-5.1/cinelerra/edit.C
@@
-150,6
+150,9
@@
int Edit::copy(int64_t start,
file->tag.set_title("NESTED_EDL");
file->tag.set_property("SRC", nested_edl->path);
file->append_tag();
file->tag.set_title("NESTED_EDL");
file->tag.set_property("SRC", nested_edl->path);
file->append_tag();
+ file->tag.set_title("/NESTED_EDL");
+ file->append_tag();
+ file->append_newline();
}
if(asset)
}
if(asset)
@@
-687,11
+690,11
@@
int Edit::shift_end_out(int edit_mode,
// Effects are shifted in length extension
if(edit_plugins)
// Effects are shifted in length extension
if(edit_plugins)
- edits->shift_effects_recursive(oldposition /* startproject */,
+ edits->shift_effects_recursive(oldposition /* startproject */,
cut_length,
edit_autos);
if(edit_autos)
cut_length,
edit_autos);
if(edit_autos)
- edits->shift_keyframes_recursive(oldposition /* startproject */,
+ edits->shift_keyframes_recursive(oldposition /* startproject */,
cut_length);
for(Edit* current_edit = next; current_edit; current_edit = current_edit->next)
cut_length);
for(Edit* current_edit = next; current_edit; current_edit = current_edit->next)
@@
-795,7
+798,7
@@
int Edit::select_handle(float view_start, float zoom_units, int cursor_x, int cu
pixel2 = right;
pixel1 = pixel2 - 10;
pixel2 = right;
pixel1 = pixel2 - 10;
-// test right edit
+// test right edit
if(cursor_x >= pixel1 && cursor_x <= pixel2)
{
selection = right_unit;
if(cursor_x >= pixel1 && cursor_x <= pixel2)
{
selection = right_unit;