X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedit.C;h=3658922df6d816a62cc1486e396072d7900649fd;hb=5c3e5d5e76c29b49708b4e42d194402150b508ab;hp=2575cfa359facc94c5b96a01544b57a30c7ccc93;hpb=0983c78067d86d25426fd34655ad9a9992ef04c7;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C index 2575cfa3..3658922d 100644 --- 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 && - !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)) @@ -690,11 +690,11 @@ int Edit::shift_end_out(int edit_mode, // 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) - 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) @@ -798,7 +798,7 @@ int Edit::select_handle(float view_start, float zoom_units, int cursor_x, int cu pixel2 = right; pixel1 = pixel2 - 10; -// test right edit +// test right edit if(cursor_x >= pixel1 && cursor_x <= pixel2) { selection = right_unit;