diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-29 23:15:24 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-29 23:15:24 +0000 |
| commit | a5bd7044a41da4d5cd1e51b850b4edd48bd3639b (patch) | |
| tree | 67b558946360fccccc452148ade9861cec9adb7b | |
| parent | 8a147cf3f099be43ec026426ca87be4f18356025 (diff) | |
| download | mpv-a5bd7044a41da4d5cd1e51b850b4edd48bd3639b.tar.bz2 mpv-a5bd7044a41da4d5cd1e51b850b4edd48bd3639b.tar.xz | |
- fix window handling with dxr3
- workaround dxr3 subpicture size with freetype osd rendering
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7152 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Gui/interface.c | 3 | ||||
| -rw-r--r-- | Gui/mplayer/play.c | 1 | ||||
| -rw-r--r-- | libvo/vo_dxr3.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Gui/interface.c b/Gui/interface.c index 246b8998c4..2ee5c5fe54 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -507,9 +507,6 @@ int guiGetEvent( int type,char * arg ) remove_vop( "fame" ); if ( !gstrcmp( video_driver,"dxr3" ) ) { - #warning workaround for this moment. - osd_level=0; - // --- if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) ) { if ( gtkVopLAVC ) add_vop( "lavc" ); diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 794173586b..a7ea92db51 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -35,6 +35,7 @@ static int mplGotoTheNext = 1; void mplFullScreen( void ) { + if ( guiIntfStruct.NoWindow && guiIntfStruct.Playing ) return; #if 0 static int sx,sy; // if ( !guiIntfStruct.Playing ) diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 28c6d601a5..5c60a298c4 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -323,8 +323,12 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32 ioctl(fd_control, EM8300_IOCTL_SET_ASPECTRATIO, &ioval); #ifdef SPU_SUPPORT +#ifdef HAVE_FREETYPE + s_width*=1.5; +#else s_width*=2; s_height*=2; +#endif osdpicbuf = calloc( 1,s_width * s_height); if (osdpicbuf == NULL) { |