manual goto rework, resize asset/track tweaks and fixes, filelist resize fix, allow...

[goodguy/cinelerra.git] / cinelerra-5.1 / guicast / vicon.h

diff --git a/cinelerra-5.1/guicast/vicon.h b/cinelerra-5.1/guicast/vicon.h
index 544e1f963031db6e20b85a0a105547821e82569c..acd11e3883502b866dcc279e831e0acb5bd892ec 100644 (file)
--- 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() {}
@@ -76,13 +74,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();
@@ -91,7 +92,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();
@@ -105,7 +106,8 @@ public:
        int zoom_scale(int dir);
        void close_view_popup();
        void hide_vicons(int v=1);
-       virtual ViewPopup *new_view_window();
+       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() {}