fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )

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

1 files changed, 57 insertions, 40 deletions

diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index 4c03eda50c..0b51c2a408 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -540,53 +540,70 @@ potihandled:
 
 int keyPressed = 0;
 
-void mplMainKeyHandle( int State,int Type,int Key )
+void mplMainKeyHandle( int KeyCode,int Type,int Key )
 {
  int msg = evNone;
 
  if ( Type != wsKeyPressed ) return;
- switch ( Key )
+ 
+ if ( !Key )
   {
-   case wsEnter:     msg=evPlay; break;
+   switch ( KeyCode )
+    {
+     case wsXFMMPrev:     msg=evPrev;              break;
+     case wsXFMMStop:	  msg=evStop;              break;
+     case wsXFMMPlay:	  msg=evPlaySwitchToPause; break;
+     case wsXFMMNext:	  msg=evNext;	           break;
+     case wsXFMMVolUp:	  msg=evIncVolume;         break;
+     case wsXFMMVolDown:  msg=evDecVolume;         break;
+     case wsXFMMMute: 	  msg=evMute;	           break;
+    }
+  }
+  else
+   {
+    switch ( Key )
+     {
+      case wsEnter:     msg=evPlay; break;
 #ifndef HAVE_NEW_INPUT
-   case '.':
-   case '>':         msg=evNext; break;
-   case ',':
-   case '<':         msg=evPrev; break;
-
-   case wsEscape:    msg=evExit; break;
-
-   case wsSpace:     msg=evPause; break;
-   case wsa:
-   case wsA:         msg=evAbout; break;
-   case wsb:
-   case wsB:         msg=evSkinBrowser; break;
-   case wse:
-   case wsE:         msg=evEqualeaser; break;
-   case wsf:
-   case wsF:         msg=evFullScreen; break;
-   case wsl:
-   case wsL:         msg=evLoad; break;
-   case wsu:
-   case wsU:         msg=evLoadSubtitle; break;
-   case wsm:
-   case wsM:         msg=evMute; break;
-   case wss:
-   case wsS:         msg=evStop; break;
-   case wsp:
-   case wsP:         msg=evPlayList; break;
+      case '.':
+      case '>':         msg=evNext; break;
+      case ',':
+      case '<':         msg=evPrev; break;
+
+      case wsEscape:    msg=evExit; break;
+
+      case wsSpace:     msg=evPause; break;
+      case wsa:
+      case wsA:         msg=evAbout; break;
+      case wsb:
+      case wsB:         msg=evSkinBrowser; break;
+      case wse:
+      case wsE:         msg=evEqualeaser; break;
+      case wsf:
+      case wsF:         msg=evFullScreen; break;
+      case wsl:
+      case wsL:         msg=evLoad; break;
+      case wsu:
+      case wsU:         msg=evLoadSubtitle; break;
+      case wsm:
+      case wsM:         msg=evMute; break;
+      case wss:
+      case wsS:         msg=evStop; break;
+      case wsp:
+      case wsP:         msg=evPlayList; break;
 #endif
 
-   case wsXF86LowerVolume:  msg=evDecVolume; break;
-   case wsXF86RaiseVolume:  msg=evIncVolume; break;
-   case wsXF86Mute:         msg=evMute; break;
-   case wsXF86Play:         msg=evPlaySwitchToPause; break;
-   case wsXF86Stop:         msg=evStop; break;
-   case wsXF86Prev:         msg=evPrev; break;
-   case wsXF86Next:         msg=evNext; break;
-   case wsXF86Media:        msg=evLoad; break;
-
-   default:          vo_x11_putkey( Key ); return;
-  }
+      case wsXF86LowerVolume:  msg=evDecVolume; break;
+      case wsXF86RaiseVolume:  msg=evIncVolume; break;
+      case wsXF86Mute:         msg=evMute; break;
+      case wsXF86Play:         msg=evPlaySwitchToPause; break;
+      case wsXF86Stop:         msg=evStop; break;
+      case wsXF86Prev:         msg=evPrev; break;
+      case wsXF86Next:         msg=evNext; break;
+      case wsXF86Media:        msg=evLoad; break;
+
+      default:          vo_x11_putkey( Key ); return;
+     }
+   }
  if ( msg != evNone ) mplEventHandling( msg,0 );
 }