X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedl.h;h=3e201a0748c03de775c3b6a502e944077762ee30;hp=f355b57ab21b29fdd24acb1b3bbe4fa53738954b;hb=03fa86e6dc495f9444ae14dad401b1ad6de793fe;hpb=6050493632cb3681227b7ec8c12decd449dcf66f

diff --git a/cinelerra-5.1/cinelerra/edl.h b/cinelerra-5.1/cinelerra/edl.h
index f355b57a..3e201a07 100644
--- a/cinelerra-5.1/cinelerra/edl.h
+++ b/cinelerra-5.1/cinelerra/edl.h
@@ -93,7 +93,7 @@ public:
 		int direction,
 		PlayableTracks *playable_tracks);
 
-// Convert position to frame boundry times
+// Convert position to frame boundary times
 	double frame_align(double position, int round);
 // frame align if cursor alignment is enabled
 	double align_to_frame(double position, int round);
@@ -167,6 +167,7 @@ public:
 // return next/prev edit starting from position
 	double next_edit(double position);
 	double prev_edit(double position);
+	double skip_silence(double position);
 // Debug
 	int dump(FILE *fp=stdout);
 	static int next_id();
@@ -210,7 +211,7 @@ public:
 		int clear_labels,
 		int clear_plugins,
 		int edit_autos);
-	void deglitch(double position);
+	int clear_hard_edges(double start, double end);
 // Insert the asset at a point in the EDL
 	void insert_asset(Asset *asset,
 		EDL *nested_edl,
@@ -221,6 +222,15 @@ public:
 	int insert_clips(ArrayList<EDL*> *new_edls, int load_mode, Track *first_track = 0);
 // Add a copy of EDL* to the clip array.  Returns the copy.
 	EDL* add_clip(EDL *edl);
+	EDL *selected_edits_to_clip(int packed,
+		double *start_position, Track **start_track,
+		int edit_labels, int edit_autos, int edit_plugins);
+	EDL *selected_edits_to_clip(int packed, double *start_position, Track **start_track);
+	void selected_edits_to_clipboard(int packed);
+	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<Indexable*> &orig_idxbls, ArrayList<Asset*> &new_assets);
 // resequence group ids starting at next_id
 	int regroup(int next_id);
 
@@ -229,8 +239,9 @@ public:
 	void get_shared_tracks(Track *track, ArrayList<SharedLocation*> *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
@@ -260,8 +271,7 @@ public:
 	void rescale_proxy(int orig_scale, int new_scale);
 	void set_proxy(int new_scale, int use_scaler,
 		ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets);
-	void add_proxy(int use_scaler,
-		ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets);
+	void add_proxy(ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets);
 	Asset *get_proxy_asset();
 	Track *add_new_track(int data_type);