[Mplayer-cvslog] CVS: main/Gui/mplayer play.c,1.24,1.25 play.h,1.10,1.11 psignal.c,1.9,1.10 psignal.h,1.3,1.4 sw.h,1.12,1.13

[Zoltan Ponekker]

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

Modified Files:
	play.c play.h psignal.c psignal.h sw.h 
Log Message:
fix skin changing, xv fullscreen redraw bug, etc.

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- play.c	4 Sep 2001 15:20:59 -0000	1.24
+++ play.c	5 Sep 2001 18:16:10 -0000	1.25
@@ -67,6 +67,8 @@
  if ( mplShMem->Playing == 2 ) { mplPause(); return; }
  mplShMem->Playing=1;
  mplSubRender=0;
+ wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
+ wsClearWindow( appMPlayer.subWindow ); 
  wsPostRedisplay( &appMPlayer.subWindow );
 }
 
@@ -162,9 +164,10 @@
     { message( False,langNEMDB ); return; }
    wsResizeWindow( &appMPlayer.mainWindow,appMPlayer.main.width,appMPlayer.main.height );
    wsMoveWindow( &appMPlayer.mainWindow,appMPlayer.main.x,appMPlayer.main.y );
-   wsResizeImage( &appMPlayer.mainWindow );
+   wsResizeImage( &appMPlayer.mainWindow,appMPlayer.main.width,appMPlayer.main.height );
    wsSetShape( &appMPlayer.mainWindow,appMPlayer.main.Mask.Image );
    mainVisible=1; mplMainRender=1; wsPostRedisplay( &appMPlayer.mainWindow );
+   
    btnModify( evSetVolume,mplShMem->Volume );
    btnModify( evSetBalance,mplShMem->Balance );
    btnModify( evSetMoviePosition,mplShMem->Position );
@@ -175,17 +178,22 @@
      if ( ( mplMenuDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.menuBase.Bitmap.ImageSize ) ) == NULL )
       { message( False,langNEMDB ); return; }
      wsResizeWindow( &appMPlayer.menuWindow,appMPlayer.menuBase.width,appMPlayer.menuBase.height );
-     wsResizeImage( &appMPlayer.menuWindow );
+     wsResizeImage( &appMPlayer.menuWindow,appMPlayer.menuBase.width,appMPlayer.menuBase.height );
     }
 
    mplSkinChanged=1;
+   if ( appMPlayer.sub.Bitmap.Image ) wsResizeImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height );
    if ( !mplShMem->Playing )
     {
      mplSkinChanged=0;
-     if ( appMPlayer.subWindow.isFullScreen ) wsFullScreen( &appMPlayer.subWindow );
-     wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
-     wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
-     if ( appMPlayer.sub.Bitmap.Image ) wsResizeImage( &appMPlayer.subWindow );
+//     if ( appMPlayer.subWindow.isFullScreen ) wsFullScreen( &appMPlayer.subWindow );
+     if ( !appMPlayer.subWindow.isFullScreen ) 
+      {
+       wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
+       wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
+      } 
+     wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
+     wsClearWindow( appMPlayer.subWindow );
      mplSubRender=1; wsPostRedisplay( &appMPlayer.subWindow );
     }
   }

Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- play.h	2 Sep 2001 21:26:51 -0000	1.10
+++ play.h	5 Sep 2001 18:16:10 -0000	1.11
@@ -87,7 +87,6 @@
 
 extern void mplPlayFork( void );
 extern void mplSigHandler( int s );
-extern void mplSendMessage( int msg );
 extern void mplPlayerThread( void );
 
 extern void ChangeSkin( void );

Index: psignal.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/psignal.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- psignal.c	31 Aug 2001 22:07:53 -0000	1.9
+++ psignal.c	5 Sep 2001 18:16:10 -0000	1.10
@@ -177,15 +177,6 @@
 // mplShMem->message=0;
 }
 
-void mplSendMessage( int msg )
-{
- if ( !mplShMem->Playing ) return;
- mplShMem->message=msg;
-// kill( mplMPlayerPID,SIGTYPE ); usleep( 10 );
-// kill( mplMPlayerPID,SIGTYPE ); usleep( 10 );
- kill( mplMPlayerPID,SIGTYPE );
-}
-
 void gtkSendMessage( int msg )
 {
  if ( !gtkIsOk ) return;

Index: psignal.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/psignal.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- psignal.h	3 Sep 2001 16:13:12 -0000	1.3
+++ psignal.h	5 Sep 2001 18:16:10 -0000	1.4
@@ -57,7 +57,6 @@
 extern void mplPlayerSigHandler( int s );
 extern void mplMainSigHandler( int s );
 
-extern void mplSendMessage( int msg );
 extern void gtkSendMessage( int msg );
 
 extern void mplErrorHandler( int critical,const char * format, ... );

Index: sw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sw.h	4 Sep 2001 16:05:25 -0000	1.12
+++ sw.h	5 Sep 2001 18:16:10 -0000	1.13
@@ -13,8 +13,8 @@
 
  if ( mplShMem->Playing )
   { 
-   wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
-   wsClearWindow( appMPlayer.subWindow );
+//   wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
+//   wsClearWindow( appMPlayer.subWindow );
    vo_expose=1; 
    mplSubRender=0;
   }