X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=6bf48433fbd3dccd13934562128075295241c019;hb=3f6a262cfe390b3f8b275297d64565a5b6272969;hp=2d041fbc45372f26355e00970e29bd12951e12cb;hpb=4b6c39e6cf4a3fd9c1b347db6de686ab55d6cac8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 2d041fbc..6bf48433 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"
 
@@ -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,20 @@ 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 blade(double position);
+	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);
@@ -488,10 +503,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);
@@ -587,6 +610,9 @@ public:
 // Viewer
 	Mutex *vwindows_lock;
 	ArrayList<VWindow*> vwindows;
+// Mixer
+	Mutex *zwindows_lock;
+	ArrayList<ZWindow*> zwindows;
 // Asset manager
 	AWindow *awindow;
 // Automation window
@@ -647,6 +673,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,