X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fdbwindow.C;h=cc60e65055e2bc3d4817883bb3227ad4273e2f77;hb=78863ce9c7fde7ebd29963554c33d89569fd7cdb;hp=28603bc618a103caae2f37caa2dae58310ce2517;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/dbwindow.C b/cinelerra-5.1/cinelerra/dbwindow.C index 28603bc6..cc60e650 100644 --- a/cinelerra-5.1/cinelerra/dbwindow.C +++ b/cinelerra-5.1/cinelerra/dbwindow.C @@ -1,4 +1,22 @@ - +/* + * CINELERRA + * Copyright (C) 2016-2020 William Morrow + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ #include "bcmenuitem.h" #include "bctimer.h" @@ -389,7 +407,7 @@ VFrame *DbWindowVIcon::frame() { if( seq_no >= images.size() ) load_frames(lbox->gui->dwindow->mdb); - return *images[seq_no]; + return images[seq_no]->vfrm; } int64_t DbWindowVIcon::set_seq_no(int64_t no) @@ -418,7 +436,7 @@ void DbWindowVIcon::read_frames(DbWindow::MDb *mdb) if( frame_id < 0 ) continue; int swidth = (SWIDTH+1) & ~1, sheight = (SHEIGHT+1) & ~1; VIFrame *vifrm = new VIFrame(swidth, sheight, BC_YUV420P); - VFrame *img = *vifrm; + VFrame *img = vifrm->vfrm; memset(img->get_y(),0x00,swidth * sheight); memset(img->get_u(),0x80,swidth/2 * sheight/2); memset(img->get_v(),0x80,swidth/2 * sheight/2); @@ -840,8 +858,8 @@ DbWindowItem(int id, const char *source, const char *title, DbWindowItem:: ~DbWindowItem() { - delete source; - delete title; + delete [] source; + delete [] title; } #define CmprFn(nm,key) int DbWindowGUI:: \ @@ -951,7 +969,6 @@ DbWindowCanvas(DbWindowGUI *gui, int x, int y, int w, int h) : Canvas(gui->dwindow->mwindow, gui, x, y, w, h, w, h, 0) { this->gui = gui; - this->is_fullscreen = 0; } DbWindowCanvas::