X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FANCommandHandler.cpp;h=f8a8ade3c421aa12d00f781b03978eb1706dc9ba;hb=abec5f17e29ff169574dfd16a54380a19a8fc39b;hp=575c4c3ac20fb478ab3cbbadd9ee1a36e61443d9;hpb=1b5cc4a2517ee8e6cebb44063ea03eb4128b4ab1;p=deb_libcec.git

diff --git a/src/lib/implementations/ANCommandHandler.cpp b/src/lib/implementations/ANCommandHandler.cpp
index 575c4c3..f8a8ade 100644
--- a/src/lib/implementations/ANCommandHandler.cpp
+++ b/src/lib/implementations/ANCommandHandler.cpp
@@ -1,8 +1,7 @@
-#pragma once
 /*
  * This file is part of the libCEC(R) library.
  *
- * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited.  All rights reserved.
  * libCEC(R) is an original work, containing original code.
  *
  * libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -32,41 +31,40 @@
  */
 
 #include "ANCommandHandler.h"
-#include "CECBusDevice.h"
-#include "CECProcessor.h"
-#include "util/StdString.h"
+#include "../devices/CECBusDevice.h"
+#include "../CECProcessor.h"
+#include "../LibCEC.h"
 
 using namespace CEC;
 
 CANCommandHandler::CANCommandHandler(CCECBusDevice *busDevice) :
     CCECCommandHandler(busDevice)
 {
+  m_vendorId = CEC_VENDOR_SAMSUNG;
+  m_bOPTSendDeckStatusUpdateOnActiveSource = false;
 }
 
 bool CANCommandHandler::HandleVendorRemoteButtonDown(const cec_command &command)
 {
-  if (command.parameters.size > 0)
+  if (m_processor->IsRunning() && 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;
+    case CEC_USER_CONTROL_CODE_AN_RETURN:
+      key.keycode = m_processor->GetClientVersion() >= CEC_CLIENT_VERSION_1_5_0 ?
+        CEC_USER_CONTROL_CODE_AN_RETURN :
+        CEC_USER_CONTROL_CODE_EXIT;
       break;
     default:
       break;
     }
 
-    if (iButton > 0 && iButton <= CEC_USER_CONTROL_CODE_MAX)
-    {
-      CStdString strLog;
-      strLog.Format("key pressed: %1x", iButton);
-      m_busDevice->AddLog(CEC_LOG_DEBUG, strLog);
-
-      m_busDevice->GetProcessor()->SetCurrentButton((cec_user_control_code) command.parameters[0]);
-    }
+    if (key.keycode != CEC_USER_CONTROL_CODE_UNKNOWN)
+      CLibCEC::AddKey(key);
   }
 
   return true;
@@ -74,29 +72,20 @@ bool CANCommandHandler::HandleVendorRemoteButtonDown(const cec_command &command)
 
 bool CANCommandHandler::HandleCommand(const cec_command &command)
 {
-  bool bHandled(true);
-  if (command.destination == m_busDevice->GetMyLogicalAddress())
+  bool bHandled(false);
+  if (m_busDevice->MyLogicalAddressContains(command.destination))
   {
     switch(command.opcode)
     {
     case CEC_OPCODE_VENDOR_REMOTE_BUTTON_DOWN:
+      bHandled = true;
       HandleVendorRemoteButtonDown(command);
       break;
     case CEC_OPCODE_VENDOR_REMOTE_BUTTON_UP:
+      bHandled = true;
       HandleUserControlRelease(command);
       break;
     default:
-      bHandled = false;
-      break;
-    }
-  }
-  else if (command.destination == CECDEVICE_BROADCAST)
-  {
-    switch(command.opcode)
-    {
-    // TODO
-    default:
-      bHandled = false;
       break;
     }
   }