[Mplayer-cvslog] CVS: main/Gui/mplayer sw.h,1.7,1.8 play.c,1.19,1.20 psignal.c,1.8,1.9

[Zoltan Ponekker]

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

Modified Files:
	sw.h play.c psignal.c 
Log Message:
fix resize

Index: sw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sw.h	31 Aug 2001 21:19:52 -0000	1.7
+++ sw.h	31 Aug 2001 22:07:53 -0000	1.8
@@ -50,18 +50,15 @@
 
  if ( ( mplShMem->Playing ) )//&&( appMPlayer.subWindow.State == wsWindowExpose ) )
   { 
-printf( "------> redraw volib.\n" );   
-   wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
-   wsClearWindow( appMPlayer.subWindow );
    vo_expose=1; 
    mplSubRender=0;
   }
 
  if ( mplSubRender )
   {
-printf( "------> redraw video.\n" );   
-   wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
-   wsClearWindow( appMPlayer.subWindow );
+   wsSetForegroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
+   XFillRectangle( wsDisplay,appMPlayer.subWindow.WindowID,appMPlayer.subWindow.wGC,0,0,
+    appMPlayer.subWindow.Width,appMPlayer.subWindow.Height );
    if ( appMPlayer.sub.Bitmap.Image ) 
     {
      wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- play.c	31 Aug 2001 21:19:52 -0000	1.19
+++ play.c	31 Aug 2001 22:07:53 -0000	1.20
@@ -48,9 +48,6 @@
 void mplStop()
 {
  if ( !mplShMem->Playing ) return;
-// ---
-printf("%%%%%% STOP  \n");
-// ---
  mplShMem->Playing=0;
  mplShMem->TimeSec=0;
  if ( !appMPlayer.subWindow.isFullScreen )
@@ -67,34 +64,27 @@
  if ( ( mplShMem->Filename[0] == 0 )||
       ( mplShMem->Playing == 1 ) ) return;
  if ( mplShMem->Playing == 2 ) { mplPause(); return; }
-// ---
-//printf("%%%%%% PLAY  \n");
-// ---
  mplShMem->Playing=1;
-// wsPostRedisplay( &appMPlayer.subWindow );
+ wsClearWindow( appMPlayer.subWindow );
  mplSubRender=0;
 }
 
 void mplPause( void )
 {
-// ---
-//printf("%%%%%% PAUSE  \n");
-// ---
  switch( mplShMem->Playing )
   {
    case 1: // playing
         mplShMem->Playing=2;
 	btnModify( evPlaySwitchToPause,btnReleased );
 	btnModify( evPauseSwitchToPlay,btnDisabled );
-        mplSubRender=0;
 	break;
     case 2: // paused
 	mplShMem->Playing=1;
 	btnModify( evPlaySwitchToPause,btnDisabled );
 	btnModify( evPauseSwitchToPlay,btnReleased );
-        mplSubRender=0;
 	break;
   }
+ mplSubRender=0;
 }
 
 void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height )
@@ -124,18 +114,12 @@
 
 void mplRelSeek( float s )
 { // -+s
-// ---
-//printf("%%%%%% RelSEEK=%5.3f  \n",s);
-// ---
  rel_seek_secs=s; abs_seek_pos=0;
 }
 
 void mplAbsSeek( float s )
 { // 0.0 ... 100.0
-// ---
-//printf("%%%%%% AbsSEEK=%5.3f  \n",s);
  rel_seek_secs=0.01*s; abs_seek_pos=3;
-// ---
 }
 
 listItems tmpList;

Index: psignal.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/psignal.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- psignal.c	31 Aug 2001 21:23:55 -0000	1.8
+++ psignal.c	31 Aug 2001 22:07:53 -0000	1.9
@@ -156,7 +156,10 @@
         break;
    case evSkinBrowser: mplShMem->SkinChange=1; break;
    case evFileLoaded:
-        strcpy( mplShMem->Filename,gtkShMem->fs.dir ); strcat( mplShMem->Filename,"/" ); strcat( mplShMem->Filename,gtkShMem->fs.filename );
+        strcpy( mplShMem->Filename,gtkShMem->fs.dir ); 
+	strcat( mplShMem->Filename,"/" ); 
+	strcat( mplShMem->Filename,gtkShMem->fs.filename );
+	printf( "%%%%%%%% Playing file: %s\n",mplShMem->Filename );
 	mplShMem->FilenameChanged=1;
         if ( mplMainAutoPlay ) mplGeneralTimer=1;
         break;