set the vendor id of devices handled by libCEC to our vendor id

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

diff --git a/src/lib/implementations/PHCommandHandler.cpp b/src/lib/implementations/PHCommandHandler.cpp
index b46f69e06bfb53cf80727744eff943ca61209f93..edb084c853af0fd7d0f6eda2c27b1872c09dbbe6 100644 (file)
--- a/src/lib/implementations/PHCommandHandler.cpp
+++ b/src/lib/implementations/PHCommandHandler.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.
@@ -86,6 +86,7 @@ CPHCommandHandler::CPHCommandHandler(CCECBusDevice *busDevice,
 {
   m_imageViewOnCheck = new CImageViewOnCheck(this);
   m_vendorId = CEC_VENDOR_PHILIPS;
+  m_bOPTSendDeckStatusUpdateOnActiveSource = false;
 }
 
 CPHCommandHandler::~CPHCommandHandler(void)
@@ -121,7 +122,7 @@ bool CPHCommandHandler::ActivateSource(bool bTransmitDelayedCommandsOnly /* = fa
   {
     // tv sometimes ignores image view on. check the power status of the tv in 5 seconds, and retry when it failed to power up
     if (m_imageViewOnCheck && !m_imageViewOnCheck->IsRunning())
-      m_imageViewOnCheck->CreateThread(false);
+      return m_imageViewOnCheck->CreateThread(false);
   }
 
   return CCECCommandHandler::ActivateSource(bTransmitDelayedCommandsOnly);
@@ -151,9 +152,8 @@ int CPHCommandHandler::HandleDeviceVendorId(const cec_command& command)
   return CCECCommandHandler::HandleDeviceVendorId(command);
 }
 
-bool CPHCommandHandler::TransmitVendorID(const cec_logical_address iInitiator, const cec_logical_address iDestination, uint64_t UNUSED(iVendorId), bool UNUSED(bIsReply))
+bool CPHCommandHandler::TransmitVendorID(const cec_logical_address iInitiator, const cec_logical_address iDestination, uint64_t UNUSED(iVendorId), bool bIsReply)
 {
-  LIB_CEC->AddLog(CEC_LOG_DEBUG, "<< %s (%X) -> %s (%X): vendor id feature abort", ToString(iInitiator), iInitiator, ToString(iDestination), iDestination);
-  m_processor->TransmitAbort(iInitiator, iDestination, CEC_OPCODE_GIVE_DEVICE_VENDOR_ID);
-  return true;
+  // XXX hack around the hack in CPHCommandHandler::InitHandler
+  return CCECCommandHandler::TransmitVendorID(iInitiator, iDestination, CEC_VENDOR_PULSE_EIGHT, bIsReply);
 }