X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=2ada7db3b9ec2ebe55d25d517fd118565ce332e4;hb=5c3e5d5e76c29b49708b4e42d194402150b508ab;hp=385f47f6dab65c7a26c3f0e38ab13fbb3480f30e;hpb=2ba7e9962ea989863e152373e96a09b00a0b4eb8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 385f47f6..2ada7db3 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -121,7 +121,7 @@ public:
 	int run_script(FileXML *script);
 	int new_project();
 	int delete_project(int flash = 1);
-	void quit(int unlock);
+	void quit();
 	int restart() { return restart_status; }
 
 	int load_defaults();
@@ -466,7 +466,8 @@ public:
 // Synchronize EDL settings with all playback engines depending on current
 // operation.  Doesn't redraw anything.
 	void sync_parameters(int change_type = CHANGE_PARAMS);
-	void to_clip();
+	void save_clip(EDL *new_edl, const char *txt);
+	void to_clip(EDL *edl, const char *txt);
 	int toggle_label(int is_mwindow);
 	void undo_entry(BC_WindowBase *calling_window_gui);
 	void redo_entry(BC_WindowBase *calling_window_gui);
@@ -491,6 +492,13 @@ public:
 	int modify_edithandles();
 	int modify_pluginhandles();
 	void finish_modify_handles();
+	void set_proxy(int use_scaler, int new_scale, int auto_scale,
+		ArrayList<Indexable*> *orig_assets,
+		ArrayList<Indexable*> *proxy_assets);
+	void add_proxy(int use_scaler,
+		ArrayList<Indexable*> *orig_assets,
+		ArrayList<Indexable*> *proxy_assets);
+	void render_proxy(ArrayList<Indexable *> &new_idxbls);
 
 	void dump_plugins(FILE *fp=stdout);
 	void dump_edl(FILE *fp=stdout);
@@ -528,6 +536,8 @@ public:
 	MainIndexes *mainindexes;
 	MainProgress *mainprogress;
 	BRender *brender;
+	char cin_lang[4];
+	int brender_active;
 	const char *default_standard;
 	static Commercials *commercials;
 	int commercial_active;
@@ -596,6 +606,7 @@ public:
 	int wait_warning();
 // Levels
 	LevelWindow *lwindow;
+	Mutex *run_lock;
 // Lock during creation and destruction of GUI
 	Mutex *plugin_gui_lock;
 	Mutex *dead_plugin_lock;
@@ -620,7 +631,7 @@ public:
 // This one happens asynchronously of the others.  Used by playback to
 // see what frame is background rendered.
 	int brender_available(int position);
-	void set_brender_start();
+	void set_brender_active(int v, int update=1);
 	int put_commercial();
 	void activate_commercial() { commercial_active = 1; }
 	void commit_commercial();
@@ -631,6 +642,7 @@ public:
 	void init_error();
 	void finit_error();
 	static void init_defaults(BC_Hash* &defaults, char *config_path);
+	void check_language();
 	const char *default_std();
 	void fill_preset_defaults(const char *preset, EDLSession *session);
 	const char *get_preset_name(int index);
@@ -642,6 +654,7 @@ public:
 	static void get_plugin_path(char *path, const char *plug_dir, const char *fs_path);
 	static int init_plugins(MWindow *mwindow, Preferences *preferences);
 	static int init_ladspa_plugins(MWindow *mwindow, Preferences *preferences);
+	static void init_plugin_tips(ArrayList<PluginServer*> &plugins, const char *lang);
 	static int check_plugin_index(ArrayList<PluginServer*> &plugins,
 		const char *plug_dir, const char *plug_path);
 	static void init_plugin_index(MWindow *mwindow, Preferences *preferences,
@@ -671,7 +684,7 @@ public:
 	void init_commercials();
 	static void add_plugins(ArrayList<PluginServer*> &plugins);
 	static void delete_plugins();
-// 
+//
 	void clean_indexes();
 //	TimeBomb timebomb;
 	SigHandler *sighandler;