Mercurial > mplayer.hg
view codec-cfg.h @ 33960:1cd81338af07
Rework fullscreen handling.
This should fix all problems the GUI had with fullscreen handling.
In interface.c:
1. Remove disabled code.
2. Set background of inactive video window to black (which prevents
some flashing when starting the playback in fullscreen mode).
3. Set the state of the fullscreen button according to next playback
mode (normal or fullscreen).
4. Make the video window invisible if there is no video, but don't
make it visible that early if there is video.
5. Set the global fullscreen variable to get aspect scaling. (Hack)
6. In GUI_SETUP_VIDEO_WINDOW:
a. First set the video size,
b. then resize and reposition,
c. then make the window visible,
d. switch to/from fullscreen, if necessary.
(This minimizes disturbances and the display stays in fullscreen
mode and is smoothly black as often as possible.)
7. When playback ends, either act as in 6. or make video window
quickly invisible if requested.
In actions.c:
8. Allow calling uiFullScreen() even if not playing.
9. Remove unnecessary (and misplaced) repositioning (but not properly
resizing) code from uiFullScreen().
10. Don't call wsFullScreen() conditionally.
11. Only set global variable vo_fs, not the global fullscreen
variable.
author | ib |
---|---|
date | Thu, 01 Sep 2011 20:15:40 +0000 |
parents | 0fd1b3f1fe69 |
children | 6b13e41172e2 |
line wrap: on
line source
/* * This file is part of MPlayer. * * MPlayer 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. * * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef MPLAYER_CODEC_CFG_H #define MPLAYER_CODEC_CFG_H #define CODECS_MAX_FOURCC 92 #define CODECS_MAX_OUTFMT 16 #define CODECS_MAX_INFMT 16 // Global flags: #define CODECS_FLAG_SEEKABLE (1<<0) #define CODECS_FLAG_ALIGN16 (1<<1) // Outfmt flags: #define CODECS_FLAG_FLIP (1<<0) #define CODECS_FLAG_NOFLIP (1<<1) #define CODECS_FLAG_YUVHACK (1<<2) #define CODECS_FLAG_QUERY (1<<3) #define CODECS_FLAG_STATIC (1<<4) #define CODECS_STATUS__MIN 0 #define CODECS_STATUS_NOT_WORKING -1 #define CODECS_STATUS_PROBLEMS 0 #define CODECS_STATUS_WORKING 1 #define CODECS_STATUS_UNTESTED 2 #define CODECS_STATUS__MAX 2 extern char *codecs_file; #if !defined(GUID_TYPE) && !defined(GUID_DEFINED) #define GUID_TYPE 1 #define GUID_DEFINED 1 typedef struct { unsigned long f1; unsigned short f2; unsigned short f3; unsigned char f4[8]; } GUID; #endif typedef struct codecs { unsigned int fourcc[CODECS_MAX_FOURCC]; unsigned int fourccmap[CODECS_MAX_FOURCC]; unsigned int outfmt[CODECS_MAX_OUTFMT]; unsigned char outflags[CODECS_MAX_OUTFMT]; unsigned int infmt[CODECS_MAX_INFMT]; unsigned char inflags[CODECS_MAX_INFMT]; char *name; char *info; char *comment; char *dll; char* drv; GUID guid; // short driver; short flags; short status; short cpuflags; } codecs_t; int parse_codec_cfg(const char *cfgfile); codecs_t* find_video_codec(unsigned int fourcc, unsigned int *fourccmap, codecs_t *start, int force); codecs_t* find_audio_codec(unsigned int fourcc, unsigned int *fourccmap, codecs_t *start, int force); codecs_t* find_codec(unsigned int fourcc, unsigned int *fourccmap, codecs_t *start, int audioflag, int force); void list_codecs(int audioflag); void codecs_uninit_free(void); typedef char ** stringset_t; void stringset_init(stringset_t *set); void stringset_free(stringset_t *set); void stringset_add(stringset_t *set, const char *str); int stringset_test(stringset_t *set, const char *str); #endif /* MPLAYER_CODEC_CFG_H */