#include "../devices/CECBusDevice.h"
#include "../CECProcessor.h"
#include "../LibCEC.h"
+#include "../CECClient.h"
#define VL_POWER_CHANGE 0x20
#define VL_POWERED_UP 0x00
using namespace CEC;
using namespace PLATFORM;
+#define LIB_CEC m_busDevice->GetProcessor()->GetLib()
+#define ToString(p) LIB_CEC->ToString(p)
+
CVLCommandHandler::CVLCommandHandler(CCECBusDevice *busDevice) :
CCECCommandHandler(busDevice),
m_bActiveSourcePending(false),
m_bPowerUpEventReceived(false)
{
m_vendorId = CEC_VENDOR_PANASONIC;
+
+ /* use the VL commandhandler for the primary device that is handled by libCEC */
+ if (busDevice->GetLogicalAddress() == CECDEVICE_TV)
+ {
+ CCECBusDevice *primary = m_processor->GetPrimaryDevice();
+ if (primary && m_busDevice->GetLogicalAddress() != primary->GetLogicalAddress())
+ {
+ primary->SetVendorId(CEC_VENDOR_PANASONIC);
+ primary->ReplaceHandler(false);
+ }
+ }
}
bool CVLCommandHandler::InitHandler(void)
{
CCECBusDevice *primary = m_processor->GetPrimaryDevice();
if (primary->GetType() == CEC_DEVICE_TYPE_RECORDING_DEVICE)
- return m_processor->ChangeDeviceType(CEC_DEVICE_TYPE_RECORDING_DEVICE, CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+ return m_processor->GetPrimaryClient()->ChangeDeviceType(CEC_DEVICE_TYPE_RECORDING_DEVICE, CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
return CCECCommandHandler::InitHandler();
}
{
if (command.parameters.At(4) == VL_POWERED_UP)
{
- CLibCEC::AddLog(CEC_LOG_DEBUG, "TV powered up");
+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "TV powered up");
{
CLockObject lock(m_mutex);
m_bPowerUpEventReceived = true;
m_processor->TransmitPendingActiveSourceCommands();
}
else if (command.parameters.At(4) == VL_POWERED_DOWN)
- CLibCEC::AddLog(CEC_LOG_DEBUG, "TV powered down");
+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "TV powered down");
else if (command.parameters.At(4) == VL_POWERED_DOWN)
- CLibCEC::AddLog(CEC_LOG_DEBUG, "unknown vendor command");
+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "unknown vendor command");
return true;
}
{
bool bPowerUpEventReceived(false);
+ CCECBusDevice *tv = m_processor->GetDevice(CECDEVICE_TV);
+ if (tv && tv->GetCurrentVendorId() == CEC_VENDOR_PANASONIC)
{
- CLockObject lock(m_mutex);
- if (!m_bPowerUpEventReceived)
- {
- // just assume it's been sent when the tv is powered on
- cec_power_status powerStatus = m_processor->m_busDevices[CECDEVICE_TV]->GetPowerStatus();
- m_bPowerUpEventReceived = (powerStatus == CEC_POWER_STATUS_ON);
- }
- bPowerUpEventReceived = m_bPowerUpEventReceived;
+ CVLCommandHandler *handler = static_cast<CVLCommandHandler *>(tv->GetHandler());
+ bPowerUpEventReceived = handler ? handler->PowerUpEventReceived() : false;
}
if (!bPowerUpEventReceived)
if (bTransmitCommand)
{
- CLibCEC::AddLog(CEC_LOG_DEBUG, "transmitting delayed activate source command");
- return CCECCommandHandler::TransmitActiveSource(m_busDevice->GetLogicalAddress(), m_busDevice->GetPhysicalAddress(false, true));
+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "transmitting delayed activate source command");
+ return CCECCommandHandler::TransmitActiveSource(m_busDevice->GetLogicalAddress(), m_busDevice->GetCurrentPhysicalAddress());
}
return true;
}
+
+bool CVLCommandHandler::PowerUpEventReceived(void)
+{
+ {
+ CLockObject lock(m_mutex);
+ if (m_bPowerUpEventReceived)
+ return true;
+ }
+
+ cec_power_status powerStatus = m_busDevice->GetCurrentPowerStatus();
+
+ CLockObject lock(m_mutex);
+ m_bPowerUpEventReceived = (powerStatus == CEC_POWER_STATUS_ON);
+ return m_bPowerUpEventReceived;
+}