X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedit.h;h=cc7c7fab51ba7706df04ae7364f67f7d952bcea8;hp=ff045fd0dc9bba69fea3c4dadb3c7aa21a09dc72;hb=076da20a596fe698e1152ce2f3f2d75d2daddec8;hpb=0c086b3e7b552e0f6b06c8696d7682d9d4bd91db diff --git a/cinelerra-5.1/cinelerra/edit.h b/cinelerra-5.1/cinelerra/edit.h index ff045fd0..cc7c7fab 100644 --- a/cinelerra-5.1/cinelerra/edit.h +++ b/cinelerra-5.1/cinelerra/edit.h @@ -77,38 +77,15 @@ public: // Shift in time virtual void shift(int64_t difference); - int shift_start_in(int edit_mode, - int64_t newposition, - int64_t oldposition, - int edit_edits, - int edit_labels, - int edit_plugins, - int edit_autos, - Edits *trim_edits); - int shift_start_out(int edit_mode, - int64_t newposition, - int64_t oldposition, - int edit_edits, - int edit_labels, - int edit_plugins, - int edit_autos, - Edits *trim_edits); - int shift_end_in(int edit_mode, - int64_t newposition, - int64_t oldposition, - int edit_edits, - int edit_labels, - int edit_plugins, - int edit_autos, - Edits *trim_edits); - int shift_end_out(int edit_mode, - int64_t newposition, - int64_t oldposition, - int edit_edits, - int edit_labels, - int edit_plugins, - int edit_autos, - Edits *trim_edits); + + void trim(int64_t difference); + int shift_start(int edit_mode, int64_t newposition, int64_t oldposition, + int edit_labels, int edit_autos, int edit_plugins, Edits *trim_edits); + int shift_end(int edit_mode, int64_t newposition, int64_t oldposition, + int edit_labels, int edit_autos, int edit_plugins, Edits *trim_edits); + int follow_edits(int64_t start, int64_t end, int64_t cut_length, + int edits_moved, int rest_moved, int edit_labels, int edit_autos, + int edit_plugins, Edits *trim_edits); void insert_transition(char *title); void detach_transition(); @@ -144,7 +121,6 @@ public: Transition *transition; Edits *edits; - Track *track; // points to an object in edl->assets if set