[Mplayer-cvslog] CVS: main/Gui/mplayer Makefile,1.4,1.5 mplayer.c,1.12,1.13 play.c,1.33,1.34 sw.h,1.13,1.14

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv15001/Gui/mplayer

Modified Files:
	Makefile mplayer.c play.c sw.h 
Log Message:
some bug fix, and sub window render speed up.. 10l kola ? :)

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	30 Sep 2001 21:59:52 -0000	1.4
+++ Makefile	1 Oct 2001 09:30:44 -0000	1.5
@@ -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)
 

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mplayer.c	12 Sep 2001 15:08:52 -0000	1.12
+++ mplayer.c	1 Oct 2001 09:30:44 -0000	1.13
@@ -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 );
 

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- play.c	25 Sep 2001 15:13:58 -0000	1.33
+++ play.c	1 Oct 2001 09:30:44 -0000	1.34
@@ -53,8 +53,8 @@
 // if ( !mplShMem->Playing ) return;
  if ( !appMPlayer.subWindow.isFullScreen )
   {
-   wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
    wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
+   wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
   }
  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 );
+  } 
 }

Index: sw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sw.h	5 Sep 2001 18:16:10 -0000	1.13
+++ sw.h	1 Oct 2001 09:30:44 -0000	1.14
@@ -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; 
 }