moved nyxboard power and user button from peripheral config to keyboa…

…rd.xml
xbmc · Jan 8, 2013 · a4ee831 · a4ee831
1 parent 8ac4a46
commit a4ee831
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/system/keymaps/nyxboard/keyboard.xml b/system/keymaps/nyxboard/keyboard.xml
@@ -8,6 +8,8 @@
       <f4 mod="shift">ActivateWindow(music)</f4>    <!-- Green -->
       <f5 mod="shift">ActivateWindow(pictures)</f5> <!-- Yellow -->
       <f6 mod="shift">ActivateWindow(programs)</f6> <!-- Blue -->
+      <key id='61952'>ActivateWindow(shutdownmenu)</key> <!-- Power button -->
+      <key id='285'>ContextMenu</key>                    <!-- User button -->
     </keyboard>
   </global>
 </keymap>
diff --git a/system/peripherals.xml b/system/peripherals.xml
@@ -5,8 +5,6 @@
     <setting key="enable_flip_commands" type="bool" value="1" label="36005" order="2" />
     <setting key="flip_keyboard" value="XBMC.VideoLibrary.Search" label="36002" order="3" />
     <setting key="flip_remote" value="Dialog.Close(virtualkeyboard)" label="36003" order="4" />
-    <setting key="key_user" value="" label="36004" order="5" />
-    <setting key="key_power" value="XBMC.ShutDown()" label="13015" order="6" />
   </peripheral>
 
   <peripheral vendor_product="2708:1001" bus="rpi" name="Raspberry Pi CEC Adapter" mapTo="cec">

diff --git a/xbmc/peripherals/devices/PeripheralNyxboard.cpp b/xbmc/peripherals/devices/PeripheralNyxboard.cpp
@@ -27,8 +27,6 @@
 using namespace PERIPHERALS;
 using namespace std;
 
-#define NYBOARD_POWER_BUTTON_KEYSYM 0x9f
-
 CPeripheralNyxboard::CPeripheralNyxboard(const PeripheralType type, const PeripheralBusType busType, const CStdString &strLocation, const CStdString &strDeviceName, int iVendorId, int iProductId) :
   CPeripheralHID(type, busType, strLocation, strDeviceName, iVendorId, iProductId)
 {
@@ -50,18 +48,6 @@ bool CPeripheralNyxboard::LookupSymAndUnicode(XBMC_keysym &keysym, uint8_t *key,
     CLog::Log(LOGDEBUG, "%s - switched to remote side", __FUNCTION__);
     strCommand = GetSettingString("flip_remote");
   }
-  else if (keysym.sym == XBMCK_F4 && keysym.mod == XBMCKMOD_NONE)
-  {
-    /* 'user' key pressed */
-    CLog::Log(LOGDEBUG, "%s - 'user' key pressed", __FUNCTION__);
-    strCommand = GetSettingString("key_user");
-  }
-  else if (keysym.sym == NYBOARD_POWER_BUTTON_KEYSYM && keysym.mod == XBMCKMOD_NONE)
-  {
-    /* 'power' key pressed */
-    CLog::Log(LOGDEBUG, "%s - 'power' key pressed", __FUNCTION__);
-    strCommand = GetSettingString("key_power");
-  }
 
   if (!strCommand.IsEmpty())
   {