X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=f15081b63b6adc296bbda43bd641198fed6420a8;hb=ad2996ab94e6e12c9c14a5b9f14792f76111dff7;hp=a7bd7e3d507f38f2df50479d3045ebee65fa6a71;hpb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index a7bd7e3d..f15081b6 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"
 
@@ -201,10 +202,17 @@ public:
 	static int plugin_exists(const char *plugin_path, ArrayList<PluginServer*> &plugins);
 	static int plugin_exists(char *plugin_path);
 	void dump_plugindb(FILE *fp);
-	void stop_playback(int wait=0);
-
-
-
+	void stop_playback(int wait);
+
+	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,14 @@ 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, int deglitch);
+	void clear(int clear_handle);
 	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();
@@ -494,6 +503,7 @@ 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();
@@ -600,6 +610,9 @@ public:
 // Viewer
 	Mutex *vwindows_lock;
 	ArrayList<VWindow*> vwindows;
+// Mixer
+	Mutex *zwindows_lock;
+	ArrayList<ZWindow*> zwindows;
 // Asset manager
 	AWindow *awindow;
 // Automation window