X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fvicon.h;h=acd11e3883502b866dcc279e831e0acb5bd892ec;hb=a6b1f3c0c5c17c3a26758abc46bcb46100308c66;hp=69cdb3629034927ba269a3c366c6e839874fa16e;hpb=e8453fdab4d5ed7b384279a5b37c92010ac13295;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/guicast/vicon.h b/cinelerra-5.1/guicast/vicon.h
index 69cdb362..acd11e38 100644
--- a/cinelerra-5.1/guicast/vicon.h
+++ b/cinelerra-5.1/guicast/vicon.h
@@ -24,7 +24,6 @@ public:
 
 class VIFrame {
 	unsigned char *img_data;
-	VFrame *vfrm;
 public:
 	VIFrame(int ww, int hh, int vcmdl) {
 		int size = BC_CModels::calculate_datasize(ww, hh, -1, vcmdl);
@@ -32,8 +31,7 @@ public:
 		vfrm = new VFrame(img_data, -1, ww, hh, vcmdl, -1);
 	}
 	~VIFrame() { delete vfrm;  delete [] img_data; }
-
-	operator VFrame *() { return vfrm; }
+	VFrame *vfrm;
 };
 
 class VIcon
@@ -53,7 +51,7 @@ public:
 	void init_audio(int audio_size);
 
 	virtual int64_t set_seq_no(int64_t no) { return seq_no = no; }
-	virtual VFrame *frame() { return *images[seq_no]; }
+	virtual VFrame *frame() { return images[seq_no]->vfrm; }
 	virtual int get_vx() { return 0; }
 	virtual int get_vy() { return 0; }
 	virtual void load_audio() {}
@@ -94,7 +92,7 @@ public:
 	void run();
 	void flash();
 	int draw(VIcon *vicon);
-	int update_view(int do_audio=1);
+	int update_view(int do_audio);
 	void draw_images();
 	void start_drawing();
 	void stop_drawing();
@@ -109,7 +107,7 @@ public:
 	void close_view_popup();
 	void hide_vicons(int v=1);
 	int show_vicon(VIcon *next);
-	virtual ViewPopup *new_view_window();
+	virtual ViewPopup *new_view_window(ViewPopup *vpopup);
 
 	virtual bool visible(VIcon *vicon, int x, int y);
 	virtual void drawing_started() {}