Mercurial > mplayer.hg
changeset 36863:8c331bcef482
Get rid of VOCTRL_GUI_NOWINDOW.
Change GUI code that determines whether the video window
should be visible in principle during playback.
| author | ib |
|---|---|
| date | Sat, 01 Mar 2014 14:59:22 +0000 |
| parents | f1da7af6fc9b |
| children | c17524b27039 |
| files | gui/interface.c libvo/video_out.h libvo/vo_dxr3.c |
| diffstat | 3 files changed, 3 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/interface.c Sat Mar 01 14:48:21 2014 +0000 +++ b/gui/interface.c Sat Mar 01 14:59:22 2014 +0000 @@ -482,15 +482,13 @@ { int i = 0; - guiInfo.VideoWindow = True; + guiInfo.VideoWindow = False; while (video_out_drivers[i++]) { - if (video_out_drivers[i - 1]->control(VOCTRL_GUISUPPORT, NULL) == VO_TRUE) { - if ((video_driver_list && !gstrcmp(video_driver_list[0], video_out_drivers[i - 1]->info->short_name)) && (video_out_drivers[i - 1]->control(VOCTRL_GUI_NOWINDOW, NULL) == VO_TRUE)) { - guiInfo.VideoWindow = False; + if ((video_driver_list && !gstrcmp(video_driver_list[0], video_out_drivers[i - 1]->info->short_name)) && (video_out_drivers[i - 1]->control(VOCTRL_GUISUPPORT, NULL) == VO_TRUE)) { + guiInfo.VideoWindow = True; break; } - } } }
--- a/libvo/video_out.h Sat Mar 01 14:48:21 2014 +0000 +++ b/libvo/video_out.h Sat Mar 01 14:59:22 2014 +0000 @@ -51,7 +51,6 @@ #define VOCTRL_RESET 3 /* true if vo driver can use GUI created windows */ #define VOCTRL_GUISUPPORT 4 -#define VOCTRL_GUI_NOWINDOW 19 /* used to switch to fullscreen */ #define VOCTRL_FULLSCREEN 5 /* signal a device pause */ @@ -71,7 +70,6 @@ /* equalizer controls */ #define VOCTRL_SET_EQUALIZER 17 #define VOCTRL_GET_EQUALIZER 18 -//#define VOCTRL_GUI_NOWINDOW 19 /* Frame duplication */ #define VOCTRL_DUPLICATE_FRAME 20 // ... 21
--- a/libvo/vo_dxr3.c Sat Mar 01 14:48:21 2014 +0000 +++ b/libvo/vo_dxr3.c Sat Mar 01 14:59:22 2014 +0000 @@ -182,11 +182,6 @@ switch (request) { case VOCTRL_GUISUPPORT: return dxr3_overlay ? VO_TRUE : VO_FALSE; - case VOCTRL_GUI_NOWINDOW: - if (dxr3_overlay) { - return VO_FALSE; - } - return VO_TRUE; case VOCTRL_SET_SPU_PALETTE: if (ioctl(fd_spu, EM8300_IOCTL_SPU_SETPALETTE, data) < 0) { mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToLoadNewSPUPalette);