- 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

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" );

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 )

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) {