X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fimplementations%2FCECCommandHandler.cpp;h=0607acd4573f89a4874bd3ceaa92967aac6c1355;hb=b5b53c7d324f4444875befe6bf75b5c4dcac743c;hp=951434722ca8d036c715b0dcdcbc4fb91bf98821;hpb=a04fbe344dee8f1ae56ad0a04d2f6ebab8f5ee24;p=deb_libcec.git

diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp
index 9514347..0607acd 100644
--- a/src/lib/implementations/CECCommandHandler.cpp
+++ b/src/lib/implementations/CECCommandHandler.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "CECCommandHandler.h"
-#include "../CECBusDevice.h"
+#include "../devices/CECBusDevice.h"
 #include "../CECProcessor.h"
 
 using namespace CEC;
@@ -49,6 +49,12 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command)
   {
     switch(command.opcode)
     {
+    case CEC_OPCODE_CEC_VERSION:
+      HandleDeviceCecVersion(command);
+      break;
+    case CEC_OPCODE_SET_MENU_LANGUAGE:
+      HandleSetMenuLanguage(command);
+      break;
     case CEC_OPCODE_GIVE_PHYSICAL_ADDRESS:
       HandleGivePhysicalAddress(command);
       break;
@@ -87,12 +93,17 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command)
       bHandled = false;
       break;
     }
+
+    m_busDevice->GetProcessor()->AddCommand(command);
   }
   else if (command.destination == CECDEVICE_BROADCAST)
   {
     CStdString strLog;
     switch (command.opcode)
     {
+    case CEC_OPCODE_SET_MENU_LANGUAGE:
+      HandleSetMenuLanguage(command);
+      break;
     case CEC_OPCODE_REQUEST_ACTIVE_SOURCE:
       HandleRequestActiveSource(command);
       break;
@@ -113,6 +124,8 @@ bool CCECCommandHandler::HandleCommand(const cec_command &command)
       bHandled = false;
       break;
     }
+
+    m_busDevice->GetProcessor()->AddCommand(command);
   }
   else
   {
@@ -125,60 +138,99 @@ 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)
 {
-  m_busDevice->GetProcessor()->ParseVendorId(command.initiator, command.parameters);
+  CCECBusDevice *device = GetDevice(command.initiator);
+  if (device)
+    device->SetVendorId(command.parameters);
+
   return true;
 }
 
 bool CCECCommandHandler::HandleDeviceVendorId(const cec_command &command)
 {
-  m_busDevice->GetProcessor()->ParseVendorId(command.initiator, command.parameters);
+  CCECBusDevice *device = GetDevice(command.initiator);
+  if (device)
+    device->SetVendorId(command.parameters);
+
   return true;
 }
 
 bool CCECCommandHandler::HandleGetCecVersion(const cec_command &command)
 {
-  m_busDevice->GetProcessor()->ReportCECVersion(command.initiator);
-  return true;
+  CCECBusDevice *device = GetDevice(command.initiator);
+  if (device)
+    return device->ReportCECVersion();
+
+  return false;
 }
 
 bool CCECCommandHandler::HandleGiveDeckStatus(const cec_command &command)
 {
-  // need to support opcodes play and deck control before doing anything with this
-  m_busDevice->GetProcessor()->TransmitAbort(command.initiator, CEC_OPCODE_GIVE_DECK_STATUS);
-  return true;
+  CCECBusDevice *device = GetDevice(command.initiator);
+  if (device)
+    return device->ReportDeckStatus();
+
+  return false;
 }
 
 bool CCECCommandHandler::HandleGiveDevicePowerStatus(const cec_command &command)
 {
-  m_busDevice->GetProcessor()->ReportPowerState(command.initiator);
-  return true;
+  CCECBusDevice *device = GetDevice(command.initiator);
+  if (device)
+    return device->ReportPowerState();
+
+  return false;
 }
 
 bool CCECCommandHandler::HandleGiveDeviceVendorId(const cec_command &command)
 {
-  m_busDevice->GetProcessor()->ReportVendorID(command.initiator);
-  return true;
+  CCECBusDevice *device = GetDevice(command.initiator);
+  if (device)
+    return device->ReportVendorID();
+
+  return false;
 }
 
 bool CCECCommandHandler::HandleGiveOSDName(const cec_command &command)
 {
-  m_busDevice->GetProcessor()->ReportOSDName(command.initiator);
-  return true;
+  CCECBusDevice *device = GetDevice(command.initiator);
+  if (device)
+    return device->ReportOSDName();
+
+  return false;
 }
 
 bool CCECCommandHandler::HandleGivePhysicalAddress(const cec_command &command)
 {
-  m_busDevice->GetProcessor()->ReportPhysicalAddress();
-  return true;
+  CCECBusDevice *device = GetThisDevice();
+  if (device)
+    return device->BroadcastPhysicalAddress();
+
+  return false;
 }
 
 bool CCECCommandHandler::HandleMenuRequest(const cec_command &command)
 {
   if (command.parameters[0] == CEC_MENU_REQUEST_TYPE_QUERY)
-    m_busDevice->GetProcessor()->ReportMenuState(command.initiator);
-  return true;
+  {
+    CCECBusDevice *device = GetDevice(command.initiator);
+    if (device)
+      return device->ReportMenuState();
+  }
+  return false;
 }
 
 bool CCECCommandHandler::HandleRequestActiveSource(const cec_command &command)
@@ -186,8 +238,10 @@ 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());
-  m_busDevice->GetProcessor()->BroadcastActiveSource();
-  return true;
+  CCECBusDevice *device = GetThisDevice();
+  if (device)
+    return device->BroadcastActiveSource();
+  return false;
 }
 
 bool CCECCommandHandler::HandleRoutingChange(const cec_command &command)
@@ -196,15 +250,33 @@ bool CCECCommandHandler::HandleRoutingChange(const cec_command &command)
   {
     uint16_t iOldAddress = ((uint16_t)command.parameters[0] << 8) | ((uint16_t)command.parameters[1]);
     uint16_t iNewAddress = ((uint16_t)command.parameters[2] << 8) | ((uint16_t)command.parameters[3]);
-    CStdString strLog;
-    strLog.Format(">> %i changed physical address from %04x to %04x", command.initiator, iOldAddress, iNewAddress);
-    m_busDevice->AddLog(CEC_LOG_DEBUG, strLog.c_str());
 
-    m_busDevice->GetProcessor()->AddCommand(command);
+    CCECBusDevice *device = GetDevice(command.initiator);
+    if (device)
+      device->SetPhysicalAddress(iNewAddress, iOldAddress);
   }
   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 (unsigned int 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)
@@ -214,7 +286,12 @@ bool CCECCommandHandler::HandleSetStreamPath(const cec_command &command)
     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())
-      m_busDevice->GetProcessor()->BroadcastActiveSource();
+    {
+      CCECBusDevice *device = GetThisDevice();
+      if (device)
+        return device->BroadcastActiveSource();
+      return false;
+    }
   }
   return true;
 }
@@ -245,5 +322,22 @@ 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
+{
+  CCECBusDevice *device = NULL;
+
+  if (iLogicalAddress >= CECDEVICE_TV && iLogicalAddress <= CECDEVICE_BROADCAST)
+    device = m_busDevice->GetProcessor()->m_busDevices[iLogicalAddress];
+
+  return device;
+}
+
+CCECBusDevice *CCECCommandHandler::GetThisDevice(void) const
+{
+  return m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetMyLogicalAddress()];
 }