mplayer.hg: libmpcodecs/vd_internal.h annotate

annotate libmpcodecs/vd_internal.h @ 33307:552f1f7731c8

Set GUI initialization flag earlier. So far, the flag is set after the call of guiInit(), but there are calls to GUI functions (like reading the GUI config) before that. As MPlayer (when exiting) only calls GUI's cleanup function guiDone() if the flag is set, it neglects calling guiDone() on any error between the first GUI function call and execution of guiInit(). Now the flag is set before the first GUI function call. As a result, GUI's own exit function (also used for fatal GUI errors, and thus also for errors occurring before guiInit() properly finishes) doesn't have to handle cleanup any longer. The code can be moved to guiDone().

author	ib
date	Sat, 07 May 2011 15:30:14 +0000
parents	4be58d992308
children

rev	line source
30421 bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	1 /*
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	2 * This file is part of MPlayer.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	3 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	4 * MPlayer is free software; you can redistribute it and/or modify
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	5 * it under the terms of the GNU General Public License as published by
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	6 * the Free Software Foundation; either version 2 of the License, or
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	7 * (at your option) any later version.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	8 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	9 * MPlayer is distributed in the hope that it will be useful,
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	12 * GNU General Public License for more details.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	13 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	14 * You should have received a copy of the GNU General Public License along
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	17 */
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory. diego parents: 26029 diff changeset	18
26029 4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards. diego parents: 26011 diff changeset	19 #ifndef MPLAYER_VD_INTERNAL_H
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards. diego parents: 26011 diff changeset	20 #define MPLAYER_VD_INTERNAL_H
4986 eb57973314ae common includes moved to private vd_internal.h arpi parents: 4966 diff changeset	21
eb57973314ae common includes moved to private vd_internal.h arpi parents: 4966 diff changeset	22 #include "codec-cfg.h"
5607 1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs arpi parents: 5003 diff changeset	23 #include "img_format.h"
4986 eb57973314ae common includes moved to private vd_internal.h arpi parents: 4966 diff changeset	24
22599 4faee1254928 Add explicit location for headers from the stream/ directory. diego parents: 5607 diff changeset	25 #include "stream/stream.h"
22601 ed8f90096c65 Add explicit location for headers from the libmpdemux/ directory. diego parents: 22599 diff changeset	26 #include "libmpdemux/demuxer.h"
ed8f90096c65 Add explicit location for headers from the libmpdemux/ directory. diego parents: 22599 diff changeset	27 #include "libmpdemux/stheader.h"
4986 eb57973314ae common includes moved to private vd_internal.h arpi parents: 4966 diff changeset	28
eb57973314ae common includes moved to private vd_internal.h arpi parents: 4966 diff changeset	29 #include "vd.h"
4878 eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	30
eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	31 // prototypes:
4966 4a0a86d7e248 commente dout info's decl arpi parents: 4878 diff changeset	32 //static vd_info_t info;
4878 eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	33 static int control(sh_video_t sh,int cmd,void arg,...);
eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	34 static int init(sh_video_t *sh);
eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	35 static void uninit(sh_video_t *sh);
eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	36 static mp_image_t* decode(sh_video_t sh,void data,int len,int flags);
eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	37
30519 e96015d17ffb Make vd_functions_t describing codecs const. reimar parents: 30421 diff changeset	38 #define LIBVD_EXTERN(x) const vd_functions_t mpcodecs_vd_##x = {\
4878 eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	39 &info,\
eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	40 init,\
eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	41 uninit,\
eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	42 control,\
eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	43 decode\
eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	44 };
eff8a76e515f libmpcodecs core - initial version arpi parents: diff changeset	45
26029 4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards. diego parents: 26011 diff changeset	46 #endif /* MPLAYER_VD_INTERNAL_H */

Mercurial > mplayer.hg

annotate libmpcodecs/vd_internal.h @ 33307:552f1f7731c8