fix mwm bug's. faszom (C), and remove mixer.*

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1861 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 5 insertions, 2 deletions

diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c
index 31008e3650..a07ea994c5 100644
--- a/Gui/mplayer/mplayer.c
+++ b/Gui/mplayer/mplayer.c
@@ -81,7 +81,7 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp )
  
  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 );
 
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index 10d686ca52..6a4d4bb581 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -318,6 +318,8 @@ NoPause:
    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;
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index b1cd724843..b0ee404126 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -202,6 +202,7 @@ void ChangeSkin( void )
 
 void EventHandling( void )
 {
- wsHandleEvents();mplTimerHandler(0); // handle GUI timer events
+ wsHandleEvents();
+ //mplTimerHandler(0); // handle GUI timer events
  if ( mplShMem->SkinChange ) ChangeSkin();
 }