X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=ef4ca95531af019066369b264d7ae92d85457591;hb=f3adc7285af86851913b48592a8c4fdfcdcdf8b6;hp=e700e71f675f718987e635051a5de43599091225;hpb=b5c58822be78c8820692c916e296a2230bb2b9e2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index e700e71f..ef4ca955 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,21 @@ 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 refresh_mixers();
+	void stop_mixers();
+	void close_mixers();
+	void open_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);
+	void tile_mixers();
 
 	int load_filenames(ArrayList<char*> *filenames,
 		int load_mode = LOADMODE_REPLACE,
@@ -237,6 +249,7 @@ public:
 	int move_right(int64_t distance = 0);
 	void move_up(int64_t distance = 0);
 	void move_down(int64_t distance = 0);
+	int find_selection(double position, int scroll_display = 0);
 
 // seek to labels
 // shift_down must be passed by the caller because different windows call
@@ -246,6 +259,8 @@ public:
 // seek to edit handles
 	int next_edit_handle(int shift_down);
 	int prev_edit_handle(int shift_down);
+// seek to keyframes
+	int nearest_plugin_keyframe(int shift_down, int dir);
 // offset is pixels to add to track_start
 	void trackmovement(int offset, int pane_number);
 // view_start is pixels
@@ -323,6 +338,7 @@ public:
 	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();
@@ -336,8 +352,6 @@ public:
 	static void create_defaults_path(char *string, const char *config_file);
 
 	void delete_folder(char *folder);
-	void delete_inpoint();
-	void delete_outpoint();
 
 	void delete_track();
 	void delete_track(Track *track);
@@ -466,6 +480,7 @@ public:
 	void toggle_editing_mode();
 	void set_inpoint(int is_mwindow);
 	void set_outpoint(int is_mwindow);
+	void unset_inoutpoint(int is_mwindow);
 	void splice(EDL *source);
 	void toggle_loop_playback();
 	void trim_selection();
@@ -494,6 +509,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 +616,9 @@ public:
 // Viewer
 	Mutex *vwindows_lock;
 	ArrayList<VWindow*> vwindows;
+// Mixer
+	Mutex *zwindows_lock;
+	ArrayList<ZWindow*> zwindows;
 // Asset manager
 	AWindow *awindow;
 // Automation window