X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=8482dc06f16606211503255bed9cf785580975c7;hb=86bd203ac1fc29d93f63d13e2979468f06bdc3a2;hp=49e36552ac8d8f9a5cbc9f476e0ce3f406013424;hpb=d94bbdeebde4f16a77c388f9f28114b945db41d9;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 49e36552..8482dc06 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -146,10 +146,6 @@ public:
 	int asset_to_edl(EDL *new_edl,
 		Asset *new_asset,
 		RecordLabels *labels = 0);
-// Convert nested_edl to a nested EDL in new_edl
-// suitable for pasting in paste_edls
-	int edl_to_nested(EDL *new_edl,
-		EDL *nested_edl);
 
 // Entry point to insert assets and insert edls.  Called by TrackCanvas
 // and AssetPopup when assets are dragged in from AWindow.
@@ -418,24 +414,17 @@ public:
 	void move_tracks_up();
 	void mute_selection();
 	void new_folder(const char *new_folder);
-	void overwrite(EDL *source);
 // For clipboard commands
 	void paste();
 // For splice and overwrite
-	int paste(double start,
-		double end,
-		FileXML *file,
-		int edit_labels,
-		int edit_plugins,
-		int edit_autos);
-	int paste_output(int64_t startproject,
-				int64_t endproject,
-				int64_t startsource_sample,
-				int64_t endsource_sample,
-				int64_t startsource_frame,
-				int64_t endsource_frame,
-				Asset *asset,
-				RecordLabels *new_labels);
+	void overwrite(EDL *source, int all);
+	void splice(EDL *source, int all);
+	int paste(double start, double end, FileXML *file,
+		int edit_labels, int edit_plugins, int edit_autos);
+	int paste_output(int64_t startproject, int64_t endproject,
+		int64_t startsource_sample, int64_t endsource_sample,
+		int64_t startsource_frame, int64_t endsource_frame,
+		Asset *asset, RecordLabels *new_labels);
 	void paste_silence();
 
 // Detach single transition
@@ -484,14 +473,13 @@ public:
 	void set_inpoint(int is_mwindow);
 	void set_outpoint(int is_mwindow);
 	void unset_inoutpoint(int is_mwindow);
-	void splice(EDL *source);
 	void toggle_loop_playback();
 	void trim_selection();
 // Synchronize EDL settings with all playback engines depending on current
 // operation.  Doesn't redraw anything.
 	void sync_parameters(int change_type = CHANGE_PARAMS);
 	void save_clip(EDL *new_edl, const char *txt);
-	void to_clip(EDL *edl, const char *txt);
+	void to_clip(EDL *edl, const char *txt, int all);
 	int toggle_label(int is_mwindow);
 	void undo_entry(BC_WindowBase *calling_window_gui);
 	void redo_entry(BC_WindowBase *calling_window_gui);