/*
* 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.
* http://www.pulse-eight.net/
*/
+#include "env.h"
#include "VLCommandHandler.h"
-#include "../devices/CECBusDevice.h"
-#include "../devices/CECPlaybackDevice.h"
-#include "../devices/CECTV.h"
-#include "../CECProcessor.h"
-#include "../LibCEC.h"
-#include "../CECClient.h"
+
+#include "lib/devices/CECBusDevice.h"
+#include "lib/devices/CECPlaybackDevice.h"
+#include "lib/devices/CECTV.h"
+#include "lib/CECProcessor.h"
+#include "lib/LibCEC.h"
+#include "lib/CECClient.h"
#define VL_POWER_CHANGE 0x20
#define VL_POWERED_UP 0x00
#define ToString(p) LIB_CEC->ToString(p)
// wait this amount of ms before trying to switch sources after receiving the message from the TV that it's powered on
-#define SOURCE_SWITCH_DELAY_MS 1000
+#define SOURCE_SWITCH_DELAY_MS 3000
CVLCommandHandler::CVLCommandHandler(CCECBusDevice *busDevice,
int32_t iTransmitTimeout /* = CEC_DEFAULT_TRANSMIT_TIMEOUT */,
int8_t iTransmitRetries /* = CEC_DEFAULT_TRANSMIT_RETRIES */,
int64_t iActiveSourcePending /* = 0 */) :
CCECCommandHandler(busDevice, iTransmitTimeout, iTransmitWait, iTransmitRetries, iActiveSourcePending),
- m_iPowerUpEventReceived(0)
+ m_iPowerUpEventReceived(0),
+ m_bCapabilitiesSent(false)
{
m_vendorId = CEC_VENDOR_PANASONIC;
}
{
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);
-
- m_processor->GetTV()->RequestPowerStatus(primary->GetLogicalAddress(), false);
+ 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();
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)
if (command.initiator == CECDEVICE_TV &&
command.parameters.At(3) == VL_UNKNOWN1)
{
+ // XXX this is also sent when the TV is powered off
+ // TODO power up sends 06:05. check whether this is also sent on power off
+#if 0
// set the power up event time
{
CLockObject lock(m_mutex);
}
// mark the TV as powered on
m_processor->GetTV()->SetPowerStatus(CEC_POWER_STATUS_ON);
+#endif
+ return COMMAND_HANDLED;
}
else if (command.initiator == CECDEVICE_TV &&
command.destination == CECDEVICE_BROADCAST &&
}
// mark the TV as powered on
m_processor->GetTV()->SetPowerStatus(CEC_POWER_STATUS_ON);
+
+ // send capabilties
+ SendVendorCommandCapabilities(m_processor->GetLogicalAddress(), command.initiator);
+
+ // reactivate the source, so the tv switches channels
+ if (m_processor->IsActiveSource(m_processor->GetLogicalAddress()))
+ m_processor->GetDevice(m_processor->GetLogicalAddress())->TransmitActiveSource(false);
}
else if (command.parameters.At(4) == VL_POWERED_DOWN)
{
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());
{
CLockObject lock(m_mutex);
m_iPowerUpEventReceived = 0;
+ m_bCapabilitiesSent = false;
}
return CCECCommandHandler::HandleStandby(command);
}
-int CVLCommandHandler::HandleVendorCommand(const cec_command &command)
+void CVLCommandHandler::VendorPreActivateSourceHook(void)
{
- // some vendor command voodoo that will enable more buttons on the remote
- if (command.parameters.size == 3 &&
- command.parameters[0] == 0x10 &&
- command.parameters[1] == 0x01 &&
- command.parameters[2] == 0x05)
+ bool bTransmit(false);
+ {
+ CLockObject lock(m_mutex);
+ bTransmit = !m_bCapabilitiesSent;
+ }
+ if (bTransmit)
+ SendVendorCommandCapabilities(m_processor->GetLogicalAddress(), CECDEVICE_TV);
+}
+
+void CVLCommandHandler::SendVendorCommandCapabilities(const cec_logical_address initiator, const cec_logical_address destination)
+{
+ if (PowerUpEventReceived())
{
cec_command response;
- cec_command::Format(response, command.destination, command.initiator, CEC_OPCODE_VENDOR_COMMAND);
+ 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);
- Transmit(response, true);
+ if (Transmit(response, false, true))
+ {
+ CLockObject lock(m_mutex);
+ m_bCapabilitiesSent = true;
+ }
+ }
+}
+int CVLCommandHandler::HandleVendorCommand(const cec_command &command)
+{
+ // some vendor command voodoo that will enable more buttons on the remote
+ if (command.parameters.size == 3 &&
+ command.parameters[0] == 0x10 &&
+ command.parameters[1] == 0x01 &&
+ command.parameters[2] == 0x05 &&
+ m_processor->IsHandledByLibCEC(command.destination))
+ {
+ SendVendorCommandCapabilities(m_processor->GetLogicalAddress(), command.initiator);
return COMMAND_HANDLED;
}
bool CVLCommandHandler::SourceSwitchAllowed(void)
{
+ if (!PowerUpEventReceived())
+ TransmitRequestPowerStatus(m_processor->GetPrimaryDevice()->GetLogicalAddress(), CECDEVICE_TV, false);
+
return PowerUpEventReceived();
}
return CCECCommandHandler::HandleSystemAudioModeRequest(command);
}
+
+int CVLCommandHandler::HandleReportPowerStatus(const cec_command &command)
+{
+ if (command.initiator == m_busDevice->GetLogicalAddress() &&
+ command.parameters.size == 1 &&
+ (cec_power_status)command.parameters[0] == CEC_POWER_STATUS_ON)
+ {
+ CLockObject lock(m_mutex);
+ if (m_iPowerUpEventReceived == 0)
+ m_iPowerUpEventReceived = GetTimeMs();
+ }
+
+ return CCECCommandHandler::HandleReportPowerStatus(command);
+}
repositories / deb_libcec.git / blobdiff