cec: added logical address autodetection and let libcec handle multiple types simulta...

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

diff --git a/src/lib/implementations/ANCommandHandler.cpp b/src/lib/implementations/ANCommandHandler.cpp
index 3b8868062fc7b2872e0a4a43f2ebb2e2f4e1e4fe..3da959eb5939f61c2e1189cddac4abbe1d297bfc 100644 (file)
--- a/src/lib/implementations/ANCommandHandler.cpp
+++ b/src/lib/implementations/ANCommandHandler.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "ANCommandHandler.h"
-#include "../CECBusDevice.h"
+#include "../devices/CECBusDevice.h"
 #include "../CECProcessor.h"
 #include "../util/StdString.h"
 
@@ -46,25 +46,26 @@ bool CANCommandHandler::HandleVendorRemoteButtonDown(const cec_command &command)
 {
   if (command.parameters.size > 0)
   {
-    m_busDevice->GetProcessor()->AddKey();
+    cec_keypress key;
+    key.duration = CEC_BUTTON_TIMEOUT;
+    key.keycode = CEC_USER_CONTROL_CODE_UNKNOWN;
 
-    uint8_t iButton = 0;
     switch (command.parameters[0])
     {
     case CEC_AN_USER_CONTROL_CODE_RETURN:
-      iButton = CEC_USER_CONTROL_CODE_PREVIOUS_CHANNEL;
+      key.keycode = CEC_USER_CONTROL_CODE_EXIT;
       break;
     default:
       break;
     }
 
-    if (iButton > 0 && iButton <= CEC_USER_CONTROL_CODE_MAX)
+    if (key.keycode != CEC_USER_CONTROL_CODE_UNKNOWN)
     {
       CStdString strLog;
-      strLog.Format("key pressed: %1x", iButton);
+      strLog.Format("key pressed: %1x", key.keycode);
       m_busDevice->AddLog(CEC_LOG_DEBUG, strLog);
 
-      m_busDevice->GetProcessor()->SetCurrentButton((cec_user_control_code) command.parameters[0]);
+      m_busDevice->GetProcessor()->AddKey(key);
     }
   }
 
@@ -74,7 +75,7 @@ bool CANCommandHandler::HandleVendorRemoteButtonDown(const cec_command &command)
 bool CANCommandHandler::HandleCommand(const cec_command &command)
 {
   bool bHandled(false);
-  if (command.destination == m_busDevice->GetMyLogicalAddress())
+  if (m_busDevice->MyLogicalAddressContains(command.destination))
   {
     switch(command.opcode)
     {