fixed - reset CVLCommandHandler::m_bCapabilitiesSent when the TV goes to standby

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

diff --git a/src/lib/implementations/VLCommandHandler.cpp b/src/lib/implementations/VLCommandHandler.cpp
index 227d8a0aa3b67e25ebe4ec8f71a4f51c85a22d1a..d14bec66cd1fe0c71cd569ab3bec21c53ab0a390 100644 (file)
--- a/src/lib/implementations/VLCommandHandler.cpp
+++ b/src/lib/implementations/VLCommandHandler.cpp
@@ -45,6 +45,8 @@
 #define VL_POWERED_DOWN 0x01
 #define VL_UNKNOWN1     0x06
 
+#define VL_REQUEST_POWER_STATUS_TIMEOUT 5000
+
 using namespace CEC;
 using namespace PLATFORM;
 
@@ -62,7 +64,7 @@ CVLCommandHandler::CVLCommandHandler(CCECBusDevice *busDevice,
     CCECCommandHandler(busDevice, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending),
     m_iPowerUpEventReceived(0),
     m_bCapabilitiesSent(false),
-    m_bPowerStatusRequested(false)
+    m_iPowerStatusRequested(0)
 {
   m_vendorId = CEC_VENDOR_PANASONIC;
 }
@@ -162,8 +164,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());
@@ -198,6 +203,7 @@ int CVLCommandHandler::HandleStandby(const cec_command &command)
   {
     CLockObject lock(m_mutex);
     m_iPowerUpEventReceived = 0;
+    m_bCapabilitiesSent = false;
   }
 
   return CCECCommandHandler::HandleStandby(command);
@@ -208,7 +214,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);
@@ -216,14 +222,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;
@@ -249,13 +255,14 @@ int CVLCommandHandler::HandleVendorCommand(const cec_command &command)
 
 bool CVLCommandHandler::TransmitRequestPowerStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWaitForResponse /* = true */)
 {
-  m_bPowerStatusRequested = true;
+  m_iPowerStatusRequested = GetTimeMs();
   return CCECCommandHandler::TransmitRequestPowerStatus(iInitiator, iDestination, bWaitForResponse);
 }
 
 bool CVLCommandHandler::SourceSwitchAllowed(void)
 {
-  if (!PowerUpEventReceived() && !m_bPowerStatusRequested)
+  int64_t now(GetTimeMs());
+  if (!PowerUpEventReceived() && now - m_iPowerStatusRequested > VL_REQUEST_POWER_STATUS_TIMEOUT)
     TransmitRequestPowerStatus(m_processor->GetPrimaryDevice()->GetLogicalAddress(), CECDEVICE_TV, false);
 
   return PowerUpEventReceived();