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 625ed010c3b42b23500179f22524d76e27e44237..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;
@@ -92,6 +93,9 @@ 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);
@@ -177,7 +181,16 @@ bool CCECCommandHandler::HandleGetCecVersion(const cec_command &command)
 {
   CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->ReportCECVersion(command.initiator);
+    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;
 }
@@ -186,7 +199,7 @@ bool CCECCommandHandler::HandleGiveDeckStatus(const cec_command &command)
 {
   CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->ReportDeckStatus(command.initiator);
+    return device->TransmitDeckStatus(command.initiator);
 
   return false;
 }
@@ -195,7 +208,7 @@ bool CCECCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command)
 {
   CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->ReportPowerState(command.initiator);
+    return device->TransmitPowerState(command.initiator);
 
   return false;
 }
@@ -204,7 +217,7 @@ bool CCECCommandHandler::HandleGiveDeviceVendorId(const cec_command &command)
 {
   CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->ReportVendorID(command.initiator);
+    return device->TransmitVendorID(command.initiator);
 
   return false;
 }
@@ -213,7 +226,7 @@ bool CCECCommandHandler::HandleGiveOSDName(const cec_command &command)
 {
   CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->ReportOSDName(command.initiator);
+    return device->TransmitOSDName(command.initiator);
 
   return false;
 }
@@ -222,7 +235,7 @@ bool CCECCommandHandler::HandleGivePhysicalAddress(const cec_command &command)
 {
   CCECBusDevice *device = GetDevice(command.destination);
   if (device)
-    return device->BroadcastPhysicalAddress();
+    return device->TransmitPhysicalAddress();
 
   return false;
 }
@@ -233,7 +246,7 @@ bool CCECCommandHandler::HandleMenuRequest(const cec_command &command)
   {
     CCECBusDevice *device = GetDevice(command.destination);
     if (device)
-      return device->ReportMenuState(command.initiator);
+      return device->TransmitMenuState(command.initiator);
   }
   return false;
 }
@@ -256,7 +269,7 @@ bool CCECCommandHandler::HandleRequestActiveSource(const cec_command &command)
   m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str());
   CCECBusDevice *device = m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetMyLogicalAddress()];
   if (device)
-    return device->BroadcastActiveSource();
+    return device->TransmitActiveSource();
   return false;
 }
 
@@ -300,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 = GetDevice(command.destination);
-      if (device)
-        return device->BroadcastActiveSource();
-      return false;
-    }
+    CCECBusDevice *device = GetDeviceByPhysicalAddress(streamaddr);
+    if (device)
+      return device->TransmitActiveSource();
   }
   return true;
 }
@@ -351,3 +360,19 @@ CCECBusDevice *CCECCommandHandler::GetDevice(cec_logical_address iLogicalAddress
 
   return device;
 }
+
+CCECBusDevice *CCECCommandHandler::GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress) const
+{
+  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;
+}