- sync with x11_common

- half rewrited font render engine (disabled by default)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8865 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 4 insertions, 4 deletions

diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c
index 040e51cf94..e0b6f13012 100644
--- a/Gui/mplayer/mw.c
+++ b/Gui/mplayer/mw.c
@@ -218,20 +218,20 @@ void mplMainDraw( void )
             PutImage( &item->Mask,item->x + (int)( ( item->width - item->psx ) * item->value / 100.0f ),item->y,3,item->pressed );
             break;
        case itSLabel:
-            image=fntRender( item->fontid,0,item->width,"%s",item->label );
+            image=fntRender( item,0,"%s",item->label );
             goto drawrenderedtext;
        case itDLabel:
             {
 	     char * t = Translate( item->label );
 	     int    l = fntTextWidth( item->fontid,t );
-             image=fntRender( item->fontid,(GetTimerMS() / 20)%(l?l:item->width),item->width,"%s",t );
+             image=fntRender( item,(GetTimerMS() / 20)%(l?l:item->width),"%s",t );
 	    }
 drawrenderedtext:
             if ( image )
              {
               PutImage( image,item->x,item->y,1,0 );
-              if ( image->Image ) free( image->Image );
-              free( image );
+//              if ( image->Image ) free( image->Image );
+//              free( image );
              }
             break;
       }