[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.9,1.10 mw.h,1.24,1.25 play.c,1.25,1.26

[Zoltan Ponekker]

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

Modified Files:
	mplayer.c mw.h play.c 
Log Message:
fix mwm bug's. faszom (C), and remove mixer.*

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mplayer.c	1 Sep 2001 17:53:07 -0000	1.9
+++ mplayer.c	6 Sep 2001 09:36:48 -0000	1.10
@@ -81,7 +81,7 @@
  
  wsCreateWindow( &appMPlayer.mainWindow,
   appMPlayer.main.x,appMPlayer.main.y,appMPlayer.main.width,appMPlayer.main.height,
-  wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsHideFrame|wsMaxSize|wsMinSize|wsShowWindow,"MPlayer" );
+  wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsHideFrame|wsMaxSize|wsShowWindow,"MPlayer" ); //wsMinSize|
 
  wsSetShape( &appMPlayer.mainWindow,appMPlayer.main.Mask.Image );
 

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mw.h	2 Sep 2001 21:49:21 -0000	1.24
+++ mw.h	6 Sep 2001 09:36:48 -0000	1.25
@@ -318,6 +318,8 @@
    case evBackward10sec:    mplRelSeek( -10 ); break;
    case evSetMoviePosition: mplAbsSeek( param ); break;
 
+   case evIncVolume:  vo_x11_putkey( wsGrayMul ); break;
+   case evDecVolume:  vo_x11_putkey( wsGrayDiv ); break;
    case evMute:       mplShMem->Mute=1; break;
    case evSetVolume:  
    case evSetBalance: mplShMem->VolumeChanged=1; break;

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- play.c	5 Sep 2001 18:16:10 -0000	1.25
+++ play.c	6 Sep 2001 09:36:48 -0000	1.26
@@ -202,6 +202,7 @@
 
 void EventHandling( void )
 {
- wsHandleEvents();mplTimerHandler(0); // handle GUI timer events
+ wsHandleEvents();
+ //mplTimerHandler(0); // handle GUI timer events
  if ( mplShMem->SkinChange ) ChangeSkin();
 }