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

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

diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp
index f321a70889e71052999cd2db93cdf9e1c08a5ec7..625ed010c3b42b23500179f22524d76e27e44237 100644 (file)
--- a/src/lib/implementations/CECCommandHandler.cpp
+++ b/src/lib/implementations/CECCommandHandler.cpp
@@ -45,15 +45,19 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command)
 {
   bool bHandled(true);
 
-  if (command.destination == m_busDevice->GetMyLogicalAddress())
+  if (m_busDevice->MyLogicalAddressContains(command.destination))
   {
     switch(command.opcode)
     {
+    case CEC_OPCODE_REPORT_POWER_STATUS:
+      HandleReportPowerStatus(command);
+      break;
     case CEC_OPCODE_CEC_VERSION:
       HandleDeviceCecVersion(command);
       break;
     case CEC_OPCODE_SET_MENU_LANGUAGE:
       HandleSetMenuLanguage(command);
+      m_busDevice->GetProcessor()->AddCommand(command);
       break;
     case CEC_OPCODE_GIVE_PHYSICAL_ADDRESS:
       HandleGivePhysicalAddress(command);
@@ -90,6 +94,7 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command)
       break;
     default:
       UnhandledCommand(command);
+      m_busDevice->GetProcessor()->AddCommand(command);
       bHandled = false;
       break;
     }
@@ -101,15 +106,18 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command)
     {
     case CEC_OPCODE_SET_MENU_LANGUAGE:
       HandleSetMenuLanguage(command);
+      m_busDevice->GetProcessor()->AddCommand(command);
       break;
     case CEC_OPCODE_REQUEST_ACTIVE_SOURCE:
       HandleRequestActiveSource(command);
       break;
     case CEC_OPCODE_SET_STREAM_PATH:
       HandleSetStreamPath(command);
+      m_busDevice->GetProcessor()->AddCommand(command);
       break;
     case CEC_OPCODE_ROUTING_CHANGE:
       HandleRoutingChange(command);
+      m_busDevice->GetProcessor()->AddCommand(command);
       break;
     case CEC_OPCODE_DEVICE_VENDOR_ID:
       HandleDeviceVendorId(command);
@@ -119,6 +127,7 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command)
      break;
     default:
       UnhandledCommand(command);
+      m_busDevice->GetProcessor()->AddCommand(command);
       bHandled = false;
       break;
     }
@@ -126,7 +135,7 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command)
   else
   {
     CStdString strLog;
-    strLog.Format("ignoring frame: destination: %u != %u", command.destination, (uint8_t)m_busDevice->GetMyLogicalAddress());
+    strLog.Format("ignoring frame: we're not at destination %x", command.destination);
     m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str());
     bHandled = false;
   }
@@ -166,52 +175,52 @@ bool CCECCommandHandler::HandleDeviceVendorId(const cec_command &command)
 
 bool CCECCommandHandler::HandleGetCecVersion(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.initiator);
+  CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->ReportCECVersion();
+    return device->ReportCECVersion(command.initiator);
 
   return false;
 }
 
 bool CCECCommandHandler::HandleGiveDeckStatus(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.initiator);
+  CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->ReportDeckStatus();
+    return device->ReportDeckStatus(command.initiator);
 
   return false;
 }
 
 bool CCECCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.initiator);
+  CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->ReportPowerState();
+    return device->ReportPowerState(command.initiator);
 
   return false;
 }
 
 bool CCECCommandHandler::HandleGiveDeviceVendorId(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.initiator);
+  CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->ReportVendorID();
+    return device->ReportVendorID(command.initiator);
 
   return false;
 }
 
 bool CCECCommandHandler::HandleGiveOSDName(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.initiator);
+  CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->ReportOSDName();
+    return device->ReportOSDName(command.initiator);
 
   return false;
 }
 
 bool CCECCommandHandler::HandleGivePhysicalAddress(const cec_command &command)
 {
-  CCECBusDevice *device = GetThisDevice();
+  CCECBusDevice *device = GetDevice(command.destination);
   if (device)
     return device->BroadcastPhysicalAddress();
 
@@ -222,19 +231,30 @@ bool CCECCommandHandler::HandleMenuRequest(const cec_command &command)
 {
   if (command.parameters[0] == CEC_MENU_REQUEST_TYPE_QUERY)
   {
-    CCECBusDevice *device = GetDevice(command.initiator);
+    CCECBusDevice *device = GetDevice(command.destination);
     if (device)
-      return device->ReportMenuState();
+      return device->ReportMenuState(command.initiator);
   }
   return false;
 }
 
+bool CCECCommandHandler::HandleReportPowerStatus(const cec_command &command)
+{
+  if (command.parameters.size == 1)
+  {
+    CCECBusDevice *device = GetDevice(command.initiator);
+    if (device)
+      device->SetPowerStatus((cec_power_status) command.parameters[0]);
+  }
+  return true;
+}
+
 bool CCECCommandHandler::HandleRequestActiveSource(const cec_command &command)
 {
   CStdString strLog;
   strLog.Format(">> %i requests active source", (uint8_t) command.initiator);
   m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str());
-  CCECBusDevice *device = GetThisDevice();
+  CCECBusDevice *device = m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetMyLogicalAddress()];
   if (device)
     return device->BroadcastActiveSource();
   return false;
@@ -263,7 +283,7 @@ bool CCECCommandHandler::HandleSetMenuLanguage(const cec_command &command)
     {
       cec_menu_language language;
       language.device = command.initiator;
-      for (unsigned int iPtr = 0; iPtr < 4; iPtr++)
+      for (uint8_t iPtr = 0; iPtr < 4; iPtr++)
         language.language[iPtr] = command.parameters[iPtr];
       language.language[3] = 0;
       device->SetMenuLanguage(language);
@@ -272,7 +292,6 @@ bool CCECCommandHandler::HandleSetMenuLanguage(const cec_command &command)
   return true;
 }
 
-
 bool CCECCommandHandler::HandleSetStreamPath(const cec_command &command)
 {
   if (command.parameters.size >= 2)
@@ -283,7 +302,7 @@ bool CCECCommandHandler::HandleSetStreamPath(const cec_command &command)
     m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str());
     if (streamaddr == m_busDevice->GetMyPhysicalAddress())
     {
-      CCECBusDevice *device = GetThisDevice();
+      CCECBusDevice *device = GetDevice(command.destination);
       if (device)
         return device->BroadcastActiveSource();
       return false;
@@ -318,7 +337,9 @@ bool CCECCommandHandler::HandleUserControlRelease(const cec_command &command)
 
 void CCECCommandHandler::UnhandledCommand(const cec_command &command)
 {
-  m_busDevice->GetProcessor()->AddCommand(command);
+  CStdString strLog;
+  strLog.Format("unhandled command with opcode %02x from address %d", command.opcode, command.initiator);
+  m_busDevice->AddLog(CEC_LOG_DEBUG, strLog);
 }
 
 CCECBusDevice *CCECCommandHandler::GetDevice(cec_logical_address iLogicalAddress) const
@@ -330,8 +351,3 @@ CCECBusDevice *CCECCommandHandler::GetDevice(cec_logical_address iLogicalAddress
 
   return device;
 }
-
-CCECBusDevice *CCECCommandHandler::GetThisDevice(void) const
-{
-  return m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetMyLogicalAddress()];
-}