Mercurial > mplayer.hg
changeset 7151:9e17b153b785
- fix window handling with dxr3
- workaround dxr3 subpicture size with freetype osd rendering
| author | pontscho |
|---|---|
| date | Thu, 29 Aug 2002 23:15:24 +0000 |
| parents | b212f74e14ec |
| children | 5d8f64646cb5 |
| files | Gui/interface.c Gui/mplayer/play.c libvo/vo_dxr3.c |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/interface.c Thu Aug 29 22:24:49 2002 +0000 +++ b/Gui/interface.c Thu Aug 29 23:15:24 2002 +0000 @@ -507,9 +507,6 @@ 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" );
--- a/Gui/mplayer/play.c Thu Aug 29 22:24:49 2002 +0000 +++ b/Gui/mplayer/play.c Thu Aug 29 23:15:24 2002 +0000 @@ -35,6 +35,7 @@ void mplFullScreen( void ) { + if ( guiIntfStruct.NoWindow && guiIntfStruct.Playing ) return; #if 0 static int sx,sy; // if ( !guiIntfStruct.Playing )
--- a/libvo/vo_dxr3.c Thu Aug 29 22:24:49 2002 +0000 +++ b/libvo/vo_dxr3.c Thu Aug 29 23:15:24 2002 +0000 @@ -323,8 +323,12 @@ 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) {