X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fvicon.h;fp=cinelerra-5.1%2Fguicast%2Fvicon.h;h=acd11e3883502b866dcc279e831e0acb5bd892ec;hp=8688d4c433bedd15d4dc618ac210a49c0890a9d9;hb=c4c898707e3fdbf2979b7bc43ac0e1b0fa779663;hpb=a718f58e6d8061f83bd0c0b10848ac415cd21fcd diff --git a/cinelerra-5.1/guicast/vicon.h b/cinelerra-5.1/guicast/vicon.h index 8688d4c4..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() {}