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

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 385f47f6..8f26357e 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -95,6 +95,7 @@
 #include "videowindow.inc"
 #include "vpatchgui.h"
 #include "vwindow.inc"
+#include "zwindow.inc"
 #include "wwindow.inc"
 #include "wavecache.inc"
 
@@ -121,7 +122,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();
@@ -203,8 +204,15 @@ public:
 	void dump_plugindb(FILE *fp);
 	void stop_playback(int wait=0);
 
-
-
+	void queue_mixers(EDL *edl, int command, int wait_tracking,
+		int use_inout, int update_refresh, int toggle_audio);
+	void stop_mixers();
+	ZWindow *get_mixer(Mixer *&mixer);
+	void del_mixer(ZWindow *zwindow);
+	int mixer_track_active(Track *track);
+	void update_mixer_tracks();
+	void start_mixer();
+	int select_zwindow(ZWindow *zwindow);
 
 	int load_filenames(ArrayList<char*> *filenames,
 		int load_mode = LOADMODE_REPLACE,
@@ -316,13 +324,19 @@ public:
 // Clears active region in EDL.
 // If clear_handle, edit boundaries are cleared if the range is 0.
 // Called by paste, record, menueffects, render, and CWindow drop.
-	void clear(int clear_handle);
+	void clear(int clear_handle, int deglitch);
 	void clear_labels();
 	int clear_labels(double start, double end);
 	void concatenate_tracks();
 	void copy();
 	int copy(double start, double end);
 	void cut();
+	void cut(double start, double end, double new_position=-1);
+// snap off edit from current position to handle/label
+	void snap_left_edit();
+	void snap_right_edit();
+	void snap_left_label();
+	void snap_right_label();
 
 // Calculate aspect ratio from pixel counts
 	static int create_aspect_ratio(float &w, float &h, int width, int height);
@@ -466,7 +480,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);
@@ -487,10 +502,18 @@ public:
 	FloatAuto* get_float_auto(PatchGUI *patch,int idx);
 	IntAuto* get_int_auto(PatchGUI *patch,int idx);
 	PanAuto* get_pan_auto(PatchGUI *patch);
+	PatchGUI *get_patchgui(Track *track);
 
 	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 +551,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;
@@ -584,6 +609,9 @@ public:
 // Viewer
 	Mutex *vwindows_lock;
 	ArrayList<VWindow*> vwindows;
+// Mixer
+	Mutex *zwindows_lock;
+	ArrayList<ZWindow*> zwindows;
 // Asset manager
 	AWindow *awindow;
 // Automation window
@@ -596,6 +624,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 +649,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 +660,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 +672,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 +702,7 @@ public:
 	void init_commercials();
 	static void add_plugins(ArrayList<PluginServer*> &plugins);
 	static void delete_plugins();
-// 
+//
 	void clean_indexes();
 //	TimeBomb timebomb;
 	SigHandler *sighandler;