X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fvicon.h;h=8688d4c433bedd15d4dc618ac210a49c0890a9d9;hb=ec59d6019f7fd79549dc6461469691203b23ac4c;hp=de8072aefc5c7cfb6cf40031c3f44fb69a38d13c;hpb=6226b2633b6460755969cb624550854669b1c79f;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/guicast/vicon.h b/cinelerra-5.1/guicast/vicon.h
index de8072ae..8688d4c4 100644
--- a/cinelerra-5.1/guicast/vicon.h
+++ b/cinelerra-5.1/guicast/vicon.h
@@ -17,9 +17,8 @@ public:
 	virtual int button_release_event() { return 0; }
 	virtual int cursor_motion_event() { return 0; }
 	virtual void draw_vframe(VFrame *frame);
-	int zoom_scale(int dir);
 
-	ViewPopup(VIconThread *vt, VFrame *frame, int x, int y, int w, int h);
+	ViewPopup(VIconThread *vt, int x, int y, int w, int h);
 	~ViewPopup();
 };
 
@@ -77,13 +76,16 @@ public:
 	Timer *timer;
 	Condition *draw_lock;
 	ViewPopup *view_win;
-	VIcon *viewing, *vicon;
+	VIcon *viewing, *vicon, *solo;
 	int vw, vh, view_w, view_h;
 	int draw_x0, draw_y0;
 	int draw_x1, draw_y1;
 	int img_dirty, win_dirty;
 	double refresh_rate;
+	int64_t now;
+	int64_t draw_flash;
 	int64_t stop_age;
+	int64_t seq_no;
 
 	ArrayList<VIcon *>t_heap;
 	VIcon *low_vicon();
@@ -92,7 +94,7 @@ public:
 	void run();
 	void flash();
 	int draw(VIcon *vicon);
-	int update_view();
+	int update_view(int do_audio);
 	void draw_images();
 	void start_drawing();
 	void stop_drawing();
@@ -103,9 +105,11 @@ public:
 	int cursor_inside(int x, int y);
 	void set_drawing_area(int x0, int y0, int x1, int y1);
 	void set_view_popup(VIcon *vicon);
+	int zoom_scale(int dir);
 	void close_view_popup();
 	void hide_vicons(int v=1);
-	virtual ViewPopup *new_view_window(VFrame *frame);
+	int show_vicon(VIcon *next);
+	virtual ViewPopup *new_view_window(ViewPopup *vpopup);
 
 	virtual bool visible(VIcon *vicon, int x, int y);
 	virtual void drawing_started() {}