Player compatible code, interface still needs some changes for player

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@874 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 37 insertions, 28 deletions

diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c
index d312380f50..a2edbde9a3 100644
--- a/uisimulator/win32/button.c
+++ b/uisimulator/win32/button.c
@@ -18,6 +18,7 @@
  ****************************************************************************/
 
 #include <windows.h>
+#include "uisw32.h"
 #include "config.h"
 #include "sh7034.h"
 #include "button.h"
@@ -34,43 +35,51 @@ void button_init(void)
 int button_get(bool block)
 {
     int btn = 0;
-    if (KEY (VK_NUMPAD4) ||
-        KEY (VK_LEFT)) // left button
-        btn |= BUTTON_LEFT;
+    if (bActive)
+    {
+        if (KEY (VK_NUMPAD4) ||
+            KEY (VK_LEFT)) // left button
+            btn |= BUTTON_LEFT;
 
-    if (KEY (VK_NUMPAD6) ||
-        KEY (VK_RIGHT))
-        btn |= BUTTON_RIGHT; // right button
+        if (KEY (VK_NUMPAD6) ||
+            KEY (VK_RIGHT))
+            btn |= BUTTON_RIGHT; // right button
 
-    if (KEY (VK_NUMPAD8) ||
-        KEY (VK_UP))
-        btn |= BUTTON_UP; // up button
+        if (KEY (VK_NUMPAD8) ||
+            KEY (VK_UP))
+            btn |= BUTTON_UP; // up button
 
-    if (KEY (VK_NUMPAD2) ||
-        KEY (VK_DOWN))
-        btn |= BUTTON_DOWN; // down button
+        if (KEY (VK_NUMPAD2) ||
+            KEY (VK_DOWN))
+            btn |= BUTTON_DOWN; // down button
 
-    if (KEY (VK_NUMPAD5) ||
-        KEY (VK_SPACE))
-        btn |= BUTTON_PLAY; // play button
+        if (KEY (VK_ADD))
+            btn |= BUTTON_ON; // on button
 
-    if (KEY (VK_RETURN))
-        btn |= BUTTON_OFF; // off button
+    #ifdef HAVE_RECORDER_KEYPAD
+        if (KEY (VK_RETURN))
+            btn |= BUTTON_OFF; // off button
 
-    if (KEY (VK_ADD))
-        btn |= BUTTON_ON; // on button
+        if (KEY (VK_DIVIDE))
+            btn |= BUTTON_F1; // F1 button
 
-    if (KEY (VK_DIVIDE))
-        btn |= BUTTON_F1; // F1 button
+        if (KEY (VK_MULTIPLY))
+            btn |= BUTTON_F2; // F2 button
 
-    if (KEY (VK_MULTIPLY))
-        btn |= BUTTON_F2; // F2 button
+        if (KEY (VK_SUBTRACT))
+            btn |= BUTTON_F3; // F3 button
 
-    if (KEY (VK_SUBTRACT))
-        btn |= BUTTON_F3; // F3 button
+        if (KEY (VK_NUMPAD5) ||
+            KEY (VK_SPACE))
+            btn |= BUTTON_PLAY; // play button
+    #else
+        if (KEY (VK_RETURN))
+            btn |= BUTTON_MENU; // menu button
+    #endif
 
-        if (btn != 0) {
-                last_key = 0 ;
-        }
+            if (btn != 0) {
+                    last_key = 0 ;
+            }
+    }
     return btn; 
 }
\ No newline at end of file