# HG changeset patch
# User pontscho
# Date 1001928646 0
# Node ID 0653e90b3118e73f97e2d1afd4bbdc085a2d02d7
# Parent  8cb7643ef73941c6bbda3d6da321dbc6d25267d3
some bug fix, and sub window render speed up.. 10l kola ? :)

diff -r 8cb7643ef739 -r 0653e90b3118 Gui/Makefile
--- a/Gui/Makefile	Sun Sep 30 21:59:52 2001 +0000
+++ b/Gui/Makefile	Mon Oct 01 09:30:46 2001 +0000
@@ -12,6 +12,9 @@
 
 OPTIMIZE =  $(OPTFLAGS) -fomit-frame-pointer \
             -fexpensive-optimizations -fschedule-insns2 -Wall
+ifeq ($(TARGET_ARCH_X86),yes)
+OPTIMIZE += -malign-double
+endif
 
 CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG) 
 
diff -r 8cb7643ef739 -r 0653e90b3118 Gui/mplayer/Makefile
--- a/Gui/mplayer/Makefile	Sun Sep 30 21:59:52 2001 +0000
+++ b/Gui/mplayer/Makefile	Mon Oct 01 09:30:46 2001 +0000
@@ -11,6 +11,9 @@
 
 OPTIMIZE =  $(OPTFLAGS) -fomit-frame-pointer \
 	    -fexpensive-optimizations -fschedule-insns2 -Wall
+ifeq ($(TARGET_ARCH_X86),yes)
+OPTIMIZE += -malign-double
+endif
 
 CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG)
 
diff -r 8cb7643ef739 -r 0653e90b3118 Gui/mplayer/mplayer.c
--- a/Gui/mplayer/mplayer.c	Sun Sep 30 21:59:52 2001 +0000
+++ b/Gui/mplayer/mplayer.c	Mon Oct 01 09:30:46 2001 +0000
@@ -104,6 +104,8 @@
  appMPlayer.subWindow.KeyHandler=mplMainKeyHandle;
  appMPlayer.subWindow.ReSize=mplResize;
 
+ if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
+
  wsPostRedisplay( &appMPlayer.mainWindow );
  wsPostRedisplay( &appMPlayer.subWindow );
 
diff -r 8cb7643ef739 -r 0653e90b3118 Gui/mplayer/play.c
--- a/Gui/mplayer/play.c	Sun Sep 30 21:59:52 2001 +0000
+++ b/Gui/mplayer/play.c	Mon Oct 01 09:30:46 2001 +0000
@@ -53,8 +53,8 @@
 // if ( !mplShMem->Playing ) return;
  if ( !appMPlayer.subWindow.isFullScreen )
   {
+   wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
    wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
-   wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
   }
  mplSubRender=1;
  wsClearWindow( appMPlayer.subWindow );
@@ -174,6 +174,7 @@
     } 
    wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
    wsClearWindow( appMPlayer.subWindow );
+   if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
    mplSubRender=1; wsPostRedisplay( &appMPlayer.subWindow );
   }
 
@@ -203,5 +204,8 @@
 void mplResizeToMovieSize( unsigned int width,unsigned int height )
 {
  if ( !appMPlayer.subWindow.isFullScreen )
+  {
    wsResizeWindow( &appMPlayer.subWindow,width,height );
+   wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
+  } 
 }
diff -r 8cb7643ef739 -r 0653e90b3118 Gui/mplayer/sw.h
--- a/Gui/mplayer/sw.h	Sun Sep 30 21:59:52 2001 +0000
+++ b/Gui/mplayer/sw.h	Mon Oct 01 09:30:46 2001 +0000
@@ -21,13 +21,13 @@
 
  if ( mplSubRender )
   {
-   wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
+//   wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
    if ( appMPlayer.sub.Bitmap.Image )
     {
-     wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
+//     wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
      wsPutImage( &appMPlayer.subWindow );
     } 
-   XFlush( wsDisplay );
+//   XFlush( wsDisplay );
   }
  appMPlayer.subWindow.State=0; 
 }
diff -r 8cb7643ef739 -r 0653e90b3118 Gui/skin/skin.c
--- a/Gui/skin/skin.c	Sun Sep 30 21:59:52 2001 +0000
+++ b/Gui/skin/skin.c	Mon Oct 01 09:30:46 2001 +0000
@@ -162,15 +162,15 @@
   }
  if ( !strcmp( winList,"sub" ) )
   {
-   defList->sub.x=x;
-   defList->sub.y=y;
    defList->sub.type=itBase;
    strcpy( tmp,path ); strcat( tmp,fname );
    if ( skinBPRead( tmp,&defList->sub.Bitmap ) ) return 1;
+   defList->sub.x=x;
+   defList->sub.y=y;
    defList->sub.width=defList->sub.Bitmap.Width;
    defList->sub.height=defList->sub.Bitmap.Height;
    #ifdef DEBUG
-    dbprintf( 3,"[skin]  width: %d height: %d\n",defList->sub.width,defList->sub.height );
+    dbprintf( 3,"[skin]  %d,%d %dx%d\n",defList->sub.x,defList->sub.y,defList->sub.width,defList->sub.height );
    #endif
   }
 /*