[Mplayer-cvslog] CVS: main/Gui/mplayer menu.h,1.7,1.8 mw.h,1.41,1.42 play.c,1.43,1.44 play.h,1.18,1.19 psignal.c,1.23,1.24

[Zoltan Ponekker]

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

Modified Files:
	menu.h mw.h play.c play.h psignal.c 
Log Message:
small bugfixes, and kill other warning

Index: menu.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/menu.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- menu.h	29 Jan 2002 20:39:40 -0000	1.7
+++ menu.h	1 Feb 2002 16:34:15 -0000	1.8
@@ -11,7 +11,7 @@
 {
  unsigned long * buf = NULL;
  unsigned long * drw = NULL;
- unsigned long   x,y,tmp;
+ int             x,y,tmp;
 
  if ( !appMPlayer.menuBase.Bitmap.Image ) return;
  if ( !mplMenuRender && !appMPlayer.menuWindow.Visible ) return;

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mw.h	29 Jan 2002 16:35:53 -0000	1.41
+++ mw.h	1 Feb 2002 16:34:15 -0000	1.42
@@ -222,8 +222,8 @@
 #endif
    case evPlay:
    case evPlaySwitchToPause:
-        btnModify( evPlaySwitchToPause,btnDisabled );
-        btnModify( evPauseSwitchToPlay,btnReleased );
+//        btnModify( evPlaySwitchToPause,btnDisabled );
+//        btnModify( evPauseSwitchToPlay,btnReleased );
         if ( ( msg == evPlaySwitchToPause )&( mplShMem->Playing == 1 ) ) goto NoPause;
         mplMainRender=1;
 
@@ -241,6 +241,7 @@
 #endif
          }
         mplPlay();
+	mplState();
         break;
    case evSetDVDSubtitle:
 #ifdef USE_DVDREAD
@@ -292,10 +293,11 @@
 
    case evStop:
         IZE("evStop");
-        btnModify( evPlaySwitchToPause,btnReleased );
-        btnModify( evPauseSwitchToPlay,btnDisabled );
+//        btnModify( evPlaySwitchToPause,btnReleased );
+//        btnModify( evPauseSwitchToPlay,btnDisabled );
         mplMainRender=1;
         mplStop();
+	mplState();
         break;
 
    case evLoadPlay:

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- play.c	31 Jan 2002 08:39:13 -0000	1.43
+++ play.c	1 Feb 2002 16:34:15 -0000	1.44
@@ -97,16 +97,31 @@
   {
    case 1: // playing
         mplShMem->Playing=2;
-	btnModify( evPlaySwitchToPause,btnReleased );
-	btnModify( evPauseSwitchToPlay,btnDisabled );
+//	btnModify( evPlaySwitchToPause,btnReleased );
+//	btnModify( evPauseSwitchToPlay,btnDisabled );
 	break;
-    case 2: // paused
+   case 2: // paused
 	mplShMem->Playing=1;
-	btnModify( evPlaySwitchToPause,btnDisabled );
-	btnModify( evPauseSwitchToPlay,btnReleased );
+//	btnModify( evPlaySwitchToPause,btnDisabled );
+//	btnModify( evPauseSwitchToPlay,btnReleased );
 	break;
   }
+ mplState();
  mplSubRender=0;
+}
+
+void mplState( void )
+{
+ if ( ( mplShMem->Playing == 0 )||( mplShMem->Playing == 2 ) )
+  {
+   btnModify( evPlaySwitchToPause,btnReleased );
+   btnModify( evPauseSwitchToPlay,btnDisabled );
+  }
+  else 
+   {
+    btnModify( evPlaySwitchToPause,btnDisabled );
+    btnModify( evPauseSwitchToPlay,btnReleased );
+   }
 }
 
 void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height )

Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- play.h	25 Dec 2001 23:31:37 -0000	1.18
+++ play.h	1 Feb 2002 16:34:15 -0000	1.19
@@ -103,6 +103,7 @@
 extern void mplFullScreen( void );
 extern void mplPlay( void );
 extern void mplPause( void );
+extern void mplState( void );
 extern void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height );
 extern void mplResizeToMovieSize( unsigned int width,unsigned int height );
 

Index: psignal.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/psignal.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- psignal.c	18 Dec 2001 23:14:29 -0000	1.23
+++ psignal.c	1 Feb 2002 16:34:15 -0000	1.24
@@ -4,6 +4,7 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
+#include <inttypes.h>
 
 #include "widgets.h"
 #include "gtk/menu.h"