X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fedl.h;h=3e201a0748c03de775c3b6a502e944077762ee30;hb=04293346a5ef49683cfa6ca3a98ef6cbfcdf7732;hp=b1c4fd3f405257dd30480a43ec0877331896fe87;hpb=da1e39d85e138b0d552e932d875c05e8dc743244;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/edl.h b/cinelerra-5.1/cinelerra/edl.h index b1c4fd3f..3e201a07 100644 --- a/cinelerra-5.1/cinelerra/edl.h +++ b/cinelerra-5.1/cinelerra/edl.h @@ -230,6 +230,7 @@ public: void paste_edits(EDL *clip, Track *first_track, double position, int overwrite, int edit_edits, int edit_labels, int edit_autos, int edit_plugins); void paste_edits(EDL *clip, Track *first_track, double position, int overwrite); + void replace_assets(ArrayList &orig_idxbls, ArrayList &new_assets); // resequence group ids starting at next_id int regroup(int next_id); @@ -238,8 +239,9 @@ public: void get_shared_tracks(Track *track, ArrayList *module_locations, int omit_recordable, int data_type); - int get_tracks_height(Theme *theme); - int64_t get_tracks_width(); + int get_tracks_height(Theme *theme); + int64_t get_tracks_width(); + // Return dimensions for canvas if smaller dimensions has zoom of 1 void calculate_conformed_dimensions(int single_channel, float &w, float &h); // Get the total output size scaled to aspect ratio @@ -269,8 +271,7 @@ public: void rescale_proxy(int orig_scale, int new_scale); void set_proxy(int new_scale, int use_scaler, ArrayList *orig_assets, ArrayList *proxy_assets); - void add_proxy(int use_scaler, - ArrayList *orig_assets, ArrayList *proxy_assets); + void add_proxy(ArrayList *orig_assets, ArrayList *proxy_assets); Asset *get_proxy_asset(); Track *add_new_track(int data_type);