X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=66f8f39373898056052f1b8e40e21d475240e7ce;hb=8fe9a22b4600301fee74b27bd8e0c44f9d681079;hp=69781804c9830a31730471e4fa9acb3568a7c01f;hpb=62709d0558a8c4366f75ae39f5f98e759e19fcfc;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 69781804..66f8f393 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -204,6 +204,7 @@ 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(int dir=1);
 	void stop_mixers();
@@ -483,7 +484,8 @@ public:
 	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();
@@ -555,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;
@@ -629,10 +633,8 @@ public:
 	Mutex *keyframe_gui_lock;
 // Lock during creation and destruction of brender so playback doesn't use it.
 	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();
 	void init_render();
@@ -653,6 +655,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();
@@ -683,7 +686,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();
@@ -700,6 +706,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;