X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=8c251e28b33af49078af7b31e018909efc40865b;hp=49e36552ac8d8f9a5cbc9f476e0ce3f406013424;hb=32294ae14f17c867a39f638112cbec12d59b32d6;hpb=d94bbdeebde4f16a77c388f9f28114b945db41d9

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 49e36552..8c251e28 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.
@@ -208,8 +204,9 @@ public:
 
 	void queue_mixers(EDL *edl, int command, int wait_tracking,
 		int use_inout, int update_refresh, int toggle_audio, int loop_play);
+	ZWindow *create_mixer(Indexable *indexable);
 	void create_mixers();
-	void refresh_mixers();
+	void refresh_mixers(int dir=1);
 	void stop_mixers();
 	void close_mixers();
 	void open_mixers();
@@ -418,24 +415,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,18 +474,18 @@ 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);
-
+	void save_undo_data();
+	void load_undo_data();
 
 	int cut_automation();
 	int copy_automation();
@@ -567,6 +557,8 @@ public:
 	static Commercials *commercials;
 	int commercial_active;
 	int has_commercials();
+// copy of edl created in speed_before, used in speed_after to normalize_speed
+	EDL *speed_edl;
 
 // Menu items
 	ArrayList<ColormodelItem*> colormodels;
@@ -643,7 +635,7 @@ public:
 	Mutex *brender_lock;
 
 // Initialize shared memory
-	void init_shm();
+	void init_shm(const char *pfn, int64_t min);
 
 // Initialize channel DB's for playback
 	void init_channeldb();
@@ -665,6 +657,7 @@ public:
 	void commit_commercial();
 	void undo_commercial();
 	void cut_commercials();
+	void update_gui(int changed_edl);
 	int paste_subtitle_text(char *text, double start, double end);
 
 	void init_error();
@@ -695,7 +688,10 @@ public:
 	static void init_ffmpeg_index(MWindow *mwindow, Preferences *preferences, FILE *fp);
 	static int load_plugin_index(MWindow *mwindow, const char *index_path,
 		const char *plugin_dir);
-	static PluginServer* new_ffmpeg_server(MWindow *mwindow, const char *name);
+	static PluginServer *new_ffmpeg_server(MWindow *mwindow, const char *name);
+	static int init_lv2_index(MWindow *mwindow, Preferences *preferences, FILE *fp);
+	static PluginServer *new_lv2_server(MWindow *mwindow, const char *name);
+
 	void init_preferences();
 	void init_signals();
 	void init_theme();
@@ -712,6 +708,9 @@ public:
 	void init_commercials();
 	static void add_plugins(ArrayList<PluginServer*> &plugins);
 	static void delete_plugins();
+	void speed_before();
+	int speed_after(int done);
+	int normalize_speed(EDL *old_edl, EDL *new_edl);
 //
 	void clean_indexes();
 //	TimeBomb timebomb;