cec: added GetDeviceVendorId()/cec_get_device_vendor_id()

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

diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp
index df685bc4731297358623eca56adb24e1a86a464b..0607acd4573f89a4874bd3ceaa92967aac6c1355 100644 (file)
--- a/src/lib/implementations/CECCommandHandler.cpp
+++ b/src/lib/implementations/CECCommandHandler.cpp
@@ -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,13 +138,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,7 +165,7 @@ bool CCECCommandHandler::HandleDeviceVendorId(const cec_command &command)
   if (device)
     device->SetVendorId(command.parameters);
 
-  return false;
+  return true;
 }
 
 bool CCECCommandHandler::HandleGetCecVersion(const cec_command &command)
@@ -190,7 +215,11 @@ bool CCECCommandHandler::HandleGiveOSDName(const cec_command &command)
 
 bool CCECCommandHandler::HandleGivePhysicalAddress(const cec_command &command)
 {
-  return m_busDevice->BroadcastPhysicalAddress();
+  CCECBusDevice *device = GetThisDevice();
+  if (device)
+    return device->BroadcastPhysicalAddress();
+
+  return false;
 }
 
 bool CCECCommandHandler::HandleMenuRequest(const cec_command &command)
@@ -209,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->BroadcastActiveSource();
-  return true;
+  CCECBusDevice *device = GetThisDevice();
+  if (device)
+    return device->BroadcastActiveSource();
+  return false;
 }
 
 bool CCECCommandHandler::HandleRoutingChange(const cec_command &command)
@@ -227,6 +258,25 @@ 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 (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)
@@ -236,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->BroadcastActiveSource();
+    {
+      CCECBusDevice *device = GetThisDevice();
+      if (device)
+        return device->BroadcastActiveSource();
+      return false;
+    }
   }
   return true;
 }
@@ -267,7 +322,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
@@ -279,3 +336,8 @@ CCECBusDevice *CCECCommandHandler::GetDevice(cec_logical_address iLogicalAddress
 
   return device;
 }
+
+CCECBusDevice *CCECCommandHandler::GetThisDevice(void) const
+{
+  return m_busDevice->GetProcessor()->m_busDevices[m_busDevice->GetMyLogicalAddress()];
+}