X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fguicast%2Fvicon.h;h=5e96f7117cabd93bbdb0eb0b4d22f5ccc61decf0;hb=47ad0dcdda5b5ae53931025c581eef1782fc5e12;hp=6af17b2a4e109d43fee144231d14d0840e6302fb;hpb=4b91e8a72deb0be3437ef0edd745646e525534d4;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/vicon.h b/cinelerra-5.1/guicast/vicon.h
index 6af17b2a..5e96f711 100644
--- a/cinelerra-5.1/guicast/vicon.h
+++ b/cinelerra-5.1/guicast/vicon.h
@@ -37,23 +37,29 @@ public:
 class VIcon
 {
 public:
-	int vw, vh, in_use;
+	int vw, vh, in_use, hidden;
 	ArrayList<VIFrame *> images;
         int64_t seq_no;
         double cycle_start, age, frame_rate;
+	int audio_size, playing_audio;
+	uint8_t *audio_data;
 
 	int64_t vframes() { return images.size(); }
 	void reset() { seq_no = 0; cycle_start = 0; age = 0; }
 	void reset(double rate) { reset(); frame_rate = rate; }
 	void clear_images() { images.remove_all_objects(); }
+	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 int get_vx() { return 0; }
 	virtual int get_vy() { return 0; }
+	virtual void load_audio() {}
+	virtual void start_audio() {}
+	virtual void stop_audio() {}
 
 	void add_image(VFrame *frm, int ww, int hh, int vcmdl);
-	void draw_vframe(BC_WindowBase *wdw, int x, int y);
+	void draw_vframe(VIconThread *vt, BC_WindowBase *wdw, int x, int y);
 	void dump(const char *dir);
 
 	VIcon(int vw=VICON_WIDTH, int vh=VICON_HEIGHT, double rate=VICON_RATE);
@@ -70,6 +76,8 @@ public:
 	ViewPopup *view_win;
 	VIcon *viewing, *vicon;
 	int view_w, view_h;
+	int draw_x0, draw_y0;
+	int draw_x1, draw_y1;
 	int img_dirty, win_dirty;
 	double refresh_rate;
 
@@ -87,6 +95,7 @@ public:
 	void reset_images();
 	void remove_vicon(int i);
 	int keypress_event(int key);
+	void set_drawing_area(int x0, int y0, int x1, int y1);
 	void set_view_popup(VIcon *vicon);
 
 	ViewPopup *new_view_window(VFrame *frame);