cec: send the correct device type in TransmitPhysicalAddress()

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

diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp
index e1d34f688acd8f62492a4700b9a0626addc1a6a3..a424bca3414d2ea38ccedac4a5dc9cfde91e9893 100644 (file)
--- a/src/lib/implementations/CECCommandHandler.cpp
+++ b/src/lib/implementations/CECCommandHandler.cpp
@@ -32,6 +32,7 @@
 
 #include "CECCommandHandler.h"
 #include "../devices/CECBusDevice.h"
+#include "../devices/CECAudioSystem.h"
 #include "../CECProcessor.h"
 
 using namespace CEC;
@@ -45,10 +46,20 @@ 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);
       break;
@@ -82,8 +93,12 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command)
     case CEC_OPCODE_USER_CONTROL_RELEASE:
       HandleUserControlRelease(command);
       break;
+    case CEC_OPCODE_GIVE_AUDIO_STATUS:
+      HandleGiveAudioStatus(command);
+      break;
     default:
       UnhandledCommand(command);
+      m_busDevice->GetProcessor()->AddCommand(command);
       bHandled = false;
       break;
     }
@@ -93,14 +108,20 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command)
     CStdString strLog;
     switch (command.opcode)
     {
+    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);
@@ -110,6 +131,7 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command)
      break;
     default:
       UnhandledCommand(command);
+      m_busDevice->GetProcessor()->AddCommand(command);
       bHandled = false;
       break;
     }
@@ -117,7 +139,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;
   }
@@ -125,13 +147,25 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command)
   return bHandled;
 }
 
+bool CCECCommandHandler::HandleDeviceCecVersion(const cec_command &command)
+{
+  if (command.parameters.size == 1)
+  {
+    CCECBusDevice *device = GetDevice(command.initiator);
+    if (device)
+      device->SetCecVersion((cec_version) command.parameters[0]);
+  }
+
+  return true;
+}
+
 bool CCECCommandHandler::HandleDeviceVendorCommandWithId(const cec_command &command)
 {
   CCECBusDevice *device = GetDevice(command.initiator);
   if (device)
     device->SetVendorId(command.parameters);
 
-  return false;
+  return true;
 }
 
 bool CCECCommandHandler::HandleDeviceVendorId(const cec_command &command)
@@ -140,59 +174,68 @@ bool CCECCommandHandler::HandleDeviceVendorId(const cec_command &command)
   if (device)
     device->SetVendorId(command.parameters);
 
-  return false;
+  return true;
 }
 
 bool CCECCommandHandler::HandleGetCecVersion(const cec_command &command)
 {
-  CCECBusDevice *device = GetDevice(command.initiator);
+  CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->ReportCECVersion();
+    return device->TransmitCECVersion(command.initiator);
+
+  return false;
+}
+
+bool CCECCommandHandler::HandleGiveAudioStatus(const cec_command &command)
+{
+  CCECBusDevice *device = GetDevice(command.destination);
+  if (device && device->GetType() == CEC_DEVICE_TYPE_AUDIO_SYSTEM)
+    return ((CCECAudioSystem *) device)->TransmitAudioStatus(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->TransmitDeckStatus(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->TransmitPowerState(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->TransmitVendorID(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->TransmitOSDName(command.initiator);
 
   return false;
 }
 
 bool CCECCommandHandler::HandleGivePhysicalAddress(const cec_command &command)
 {
-  CCECBusDevice *device = GetThisDevice();
+  CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->BroadcastPhysicalAddress();
+    return device->TransmitPhysicalAddress();
 
   return false;
 }
@@ -201,21 +244,32 @@ 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->TransmitMenuState(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 device->TransmitActiveSource();
   return false;
 }
 
@@ -233,6 +287,24 @@ bool CCECCommandHandler::HandleRoutingChange(const cec_command &command)
   return true;
 }
 
+bool CCECCommandHandler::HandleSetMenuLanguage(const cec_command &command)
+{
+  if (command.parameters.size == 3)
+  {
+    CCECBusDevice *device = GetDevice(command.initiator);
+    if (device)
+    {
+      cec_menu_language language;
+      language.device = command.initiator;
+      for (uint8_t iPtr = 0; iPtr < 4; iPtr++)
+        language.language[iPtr] = command.parameters[iPtr];
+      language.language[3] = 0;
+      device->SetMenuLanguage(language);
+    }
+  }
+  return true;
+}
+
 bool CCECCommandHandler::HandleSetStreamPath(const cec_command &command)
 {
   if (command.parameters.size >= 2)
@@ -241,13 +313,9 @@ bool CCECCommandHandler::HandleSetStreamPath(const cec_command &command)
     CStdString strLog;
     strLog.Format(">> %i requests stream path from physical address %04x", command.initiator, streamaddr);
     m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str());
-    if (streamaddr == m_busDevice->GetMyPhysicalAddress())
-    {
-      CCECBusDevice *device = GetThisDevice();
-      if (device)
-        return device->BroadcastActiveSource();
-      return false;
-    }
+    CCECBusDevice *device = GetDeviceByPhysicalAddress(streamaddr);
+    if (device)
+      return device->TransmitActiveSource();
   }
   return true;
 }
@@ -278,7 +346,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
@@ -291,7 +361,18 @@ CCECBusDevice *CCECCommandHandler::GetDevice(cec_logical_address iLogicalAddress
   return device;
 }
 
-CCECBusDevice *CCECCommandHandler::GetThisDevice(void) const
+CCECBusDevice *CCECCommandHandler::GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress) const
 {
-  return m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetMyLogicalAddress()];
+  CCECBusDevice *device = NULL;
+
+  for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
+  {
+    if (m_busDevice->GetProcessor()->m_busDevices[iPtr]->GetPhysicalAddress() == iPhysicalAddress)
+    {
+      device = m_busDevice->GetProcessor()->m_busDevices[iPtr];
+      break;
+    }
+  }
+
+  return device;
 }