updated copyright messages for 2013

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

diff --git a/src/lib/implementations/VLCommandHandler.cpp b/src/lib/implementations/VLCommandHandler.cpp
index 072d71182ec2c92ca7c780ab68b41ecb0330c249..44feabc4f4e5efe0e6cd74739121605646ca74fd 100644 (file)
--- a/src/lib/implementations/VLCommandHandler.cpp
+++ b/src/lib/implementations/VLCommandHandler.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libCEC(R) library.
  *
- * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited.  All rights reserved.
  * libCEC(R) is an original work, containing original code.
  *
  * libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -76,13 +76,21 @@ bool CVLCommandHandler::InitHandler(void)
     {
       if (primary && m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
       {
+        libcec_configuration config;
+        m_processor->GetPrimaryClient()->GetCurrentConfiguration(config);
+        if (config.iDoubleTapTimeoutMs == 0)
+        {
+          config.iDoubleTapTimeoutMs = CEC_DOUBLE_TAP_TIMEOUT_MS;
+          m_processor->GetPrimaryClient()->SetConfiguration(config);
+        }
+
         primary->SetVendorId(CEC_VENDOR_PANASONIC);
         primary->ReplaceHandler(false);
       }
-    }
 
-    if (primary->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
-      return m_processor->GetPrimaryClient()->ChangeDeviceType(CEC_DEVICE_TYPE_RECORDING_DEVICE, CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+      if (primary->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
+        return m_processor->GetPrimaryClient()->ChangeDeviceType(CEC_DEVICE_TYPE_RECORDING_DEVICE, CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+    }
   }
 
   return CCECCommandHandler::InitHandler();
@@ -90,6 +98,9 @@ bool CVLCommandHandler::InitHandler(void)
 
 int CVLCommandHandler::HandleDeviceVendorCommandWithId(const cec_command &command)
 {
+  if (!m_processor->IsHandledByLibCEC(command.destination))
+    return CEC_ABORT_REASON_INVALID_OPERAND;
+
   if (command.parameters[0] != 0x00 ||
       command.parameters[1] != 0x80 ||
       command.parameters[2] != 0x45)
@@ -158,8 +169,11 @@ bool CVLCommandHandler::PowerUpEventReceived(void)
 
   if (m_busDevice->GetLogicalAddress() != CECDEVICE_TV)
   {
+    CCECBusDevice* tv = m_processor->GetTV();
+    if (tv && tv->GetStatus() != CEC_DEVICE_STATUS_PRESENT)
+      return true;
+
     // get the status from the TV
-    CCECBusDevice *tv = m_processor->GetTV();
     if (tv && tv->GetCurrentVendorId() == CEC_VENDOR_PANASONIC)
     {
       CVLCommandHandler *handler = static_cast<CVLCommandHandler *>(tv->GetHandler());
@@ -194,6 +208,7 @@ int CVLCommandHandler::HandleStandby(const cec_command &command)
   {
     CLockObject lock(m_mutex);
     m_iPowerUpEventReceived = 0;
+    m_bCapabilitiesSent = false;
   }
 
   return CCECCommandHandler::HandleStandby(command);
@@ -204,7 +219,7 @@ void CVLCommandHandler::VendorPreActivateSourceHook(void)
   bool bTransmit(false);
   {
     CLockObject lock(m_mutex);
-    bTransmit = m_bCapabilitiesSent;
+    bTransmit = !m_bCapabilitiesSent;
   }
   if (bTransmit)
     SendVendorCommandCapabilities(m_processor->GetLogicalAddress(), CECDEVICE_TV);
@@ -212,14 +227,14 @@ void CVLCommandHandler::VendorPreActivateSourceHook(void)
 
 void CVLCommandHandler::SendVendorCommandCapabilities(const cec_logical_address initiator, const cec_logical_address destination)
 {
-  cec_command response;
-  cec_command::Format(response, initiator, destination, CEC_OPCODE_VENDOR_COMMAND);
-  uint8_t iResponseData[] = {0x10, 0x02, 0xFF, 0xFF, 0x00, 0x05, 0x05, 0x45, 0x55, 0x5c, 0x58, 0x32};
-  response.PushArray(12, iResponseData);
-
-  if (Transmit(response, false, true))
+  if (PowerUpEventReceived())
   {
-    if (PowerUpEventReceived())
+    cec_command response;
+    cec_command::Format(response, initiator, destination, CEC_OPCODE_VENDOR_COMMAND);
+    uint8_t iResponseData[] = {0x10, 0x02, 0xFF, 0xFF, 0x00, 0x05, 0x05, 0x45, 0x55, 0x5c, 0x58, 0x32};
+    response.PushArray(12, iResponseData);
+
+    if (Transmit(response, false, true))
     {
       CLockObject lock(m_mutex);
       m_bCapabilitiesSent = true;
@@ -233,7 +248,8 @@ int CVLCommandHandler::HandleVendorCommand(const cec_command &command)
   if (command.parameters.size == 3 &&
       command.parameters[0] == 0x10 &&
       command.parameters[1] == 0x01 &&
-      command.parameters[2] == 0x05)
+      command.parameters[2] == 0x05 &&
+      m_processor->IsHandledByLibCEC(command.destination))
   {
     SendVendorCommandCapabilities(m_processor->GetLogicalAddress(), command.initiator);
     return COMMAND_HANDLED;
@@ -244,6 +260,9 @@ int CVLCommandHandler::HandleVendorCommand(const cec_command &command)
 
 bool CVLCommandHandler::SourceSwitchAllowed(void)
 {
+  if (!PowerUpEventReceived())
+    TransmitRequestPowerStatus(m_processor->GetPrimaryDevice()->GetLogicalAddress(), CECDEVICE_TV, false);
+
   return PowerUpEventReceived();
 }