X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fzwindow.h;h=11b238ab80bca6278b83f51a1372dcc5114c12d6;hb=f62d927a25cb3b02f2197fde99c77df3005d41a7;hp=7f46fff0e4d3efaf196301576017d7321baad0ff;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/zwindow.h b/cinelerra-5.1/cinelerra/zwindow.h
index 7f46fff0..11b238ab 100644
--- a/cinelerra-5.1/cinelerra/zwindow.h
+++ b/cinelerra-5.1/cinelerra/zwindow.h
@@ -28,18 +28,17 @@
 #include "edl.inc"
 #include "filexml.inc"
 #include "mwindow.inc"
-#include "playbackengine.inc"
 #include "renderengine.inc"
 #include "zwindowgui.inc"
 
 class Mixer {
 public:
-	int idx;
+	int idx, show;
 	int x, y, w, h;
 	ArrayList<int> mixer_ids;
 	char title[BCSTRLEN];
 
-	Mixer(int idx);
+	Mixer(int idx, int show);
 	void save(FileXML *file);
 	int load(FileXML *file);
 	void copy_from(Mixer &that);
@@ -52,9 +51,9 @@ class Mixers : public ArrayList<Mixer *>
 public:
 	Mixers();
 	~Mixers();
-	Mixer *new_mixer();
+	Mixer *new_mixer(int show=0);
 	Mixer *get_mixer(int idx);
-	void del_mixer(int idx);
+	void del_mixer(Mixer *mixer);
 	void save(FileXML *file);
 	int load(FileXML *file);
 	void copy_from(Mixers &that);
@@ -71,8 +70,8 @@ public:
 	void handle_close_event(int result);
 	void change_source(EDL *edl);
 	void stop_playback(int wait);
-	void issue_command(int command, int wait_tracking, int use_inout,
-			int update_refresh, int toggle_audio, int loop_play);
+	void handle_mixer(int command, int wait_tracking,
+		int use_inout, int toggle_audio, int loop_play, float speed);
 	void update_mixer_ids();
 	void set_title(const char *tp);
 	void reposition(int x, int y, int w, int h);
@@ -82,9 +81,10 @@ public:
 	ZWindowGUI *zgui;
 	EDL* edl;
 
-	int idx, destroy;
-	int highlighted;
+	int idx;
+	int highlighted, playable;
 	char title[BCTEXTLEN];
+	float zoom;
 };
 
 #endif