Added support for user control codes TOP_MENU, DVD_MENU, SELECT_BROADCAST_TYPE, SELEC...

[deb_libcec.git] / src / lib / implementations / RLCommandHandler.cpp

diff --git a/src/lib/implementations/RLCommandHandler.cpp b/src/lib/implementations/RLCommandHandler.cpp
index 42bbe9ce0e7d651c128b81037df9ca416a972c86..cb6cd31e89eed7bdf5f53bfc784cc2adf39285ba 100644 (file)
--- a/src/lib/implementations/RLCommandHandler.cpp
+++ b/src/lib/implementations/RLCommandHandler.cpp
@@ -42,8 +42,6 @@
 using namespace CEC;
 using namespace PLATFORM;
 
-#define LIB_CEC     m_busDevice->GetProcessor()->GetLib()
-
 #define RL_KEY_TOP_MENU           0x10
 #define RL_KEY_DVD_MENU           0x11
 
@@ -110,21 +108,21 @@ int CRLCommandHandler::HandleDeviceVendorCommandWithId(const cec_command &comman
     case CEC_OPCODE_USER_CONTROL_PRESSED:
       if (command.parameters.size == 5)
       {
+        bHandled = true;
         switch (command.parameters[4])
         {
-        // top menu -> root menu
+        // top menu
         case RL_KEY_TOP_MENU:
-          client->SetCurrentButton(CEC_USER_CONTROL_CODE_ROOT_MENU);
+          client->SetCurrentButton(CEC_USER_CONTROL_CODE_TOP_MENU);
           break;
-        // dvd menu -> contents menu
+        // dvd menu
         case RL_KEY_DVD_MENU:
-          client->SetCurrentButton(CEC_USER_CONTROL_CODE_CONTENTS_MENU);
+          client->SetCurrentButton(CEC_USER_CONTROL_CODE_DVD_MENU);
           break;
         default:
-          LIB_CEC->AddLog(CEC_LOG_NOTICE, "key with keycode '%02x' is not mapped in libCEC. please send an email to support@pulse-eight.com with this keycode, and tell which key you pressed, and we'll add support for this key.");
+          bHandled = false;
           break;
         }
-        bHandled = true;
       }
       break;
     // user control released