backwards compatibility for older client versions and the new double tap timeout...

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

diff --git a/src/lib/implementations/VLCommandHandler.cpp b/src/lib/implementations/VLCommandHandler.cpp
index 790e25b8aa2f6533d8ef508d16f5f3b126031ba4..12a36e6c7d2988882552646e7f45ca1e5dc7149b 100644 (file)
--- a/src/lib/implementations/VLCommandHandler.cpp
+++ b/src/lib/implementations/VLCommandHandler.cpp
@@ -78,9 +78,9 @@ bool CVLCommandHandler::InitHandler(void)
       {
         libcec_configuration config;
         m_processor->GetPrimaryClient()->GetCurrentConfiguration(config);
-        if (config.iDoubleTapTimeoutMs == 0)
+        if (config.iDoubleTapTimeout50Ms == 0)
         {
-          config.iDoubleTapTimeoutMs = CEC_DOUBLE_TAP_TIMEOUT_MS;
+          config.iDoubleTapTimeout50Ms = config.clientVersion >= CEC_CLIENT_VERSION_2_2_0 ? CEC_DOUBLE_TAP_TIMEOUT_50_MS : CEC_DOUBLE_TAP_TIMEOUT_MS_OLD;
           m_processor->GetPrimaryClient()->SetConfiguration(config);
         }
 
@@ -258,6 +258,10 @@ int CVLCommandHandler::HandleVendorCommand(const cec_command &command)
     // XXX i've seen 0x05 and 0x03 as third param. these probably indicate different types of TVs/capabilities
     // when we feature abort this, then the TV will try the same thing with a vendor command with id
     SendVendorCommandCapabilities(m_processor->GetLogicalAddress(), command.initiator);
+
+    CCECBusDevice* dev = m_processor->GetDevice(command.destination);
+    if (dev && dev->IsActiveSource())
+      dev->ActivateSource(500);
     return COMMAND_HANDLED;
   }