using namespace std;
using namespace PLATFORM;
-CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types) :
+CCECProcessor::CCECProcessor(CLibCEC *controller, const libcec_configuration *configuration) :
m_bInitialised(false),
+ m_iPhysicalAddress(configuration->iPhysicalAddress),
+ m_iHDMIPort(configuration->iHDMIPort),
+ m_iBaseDevice(configuration->baseDevice),
+ m_strDeviceName(configuration->strDeviceName),
+ m_types(configuration->deviceTypes),
+ m_communication(NULL),
+ m_controller(controller),
+ m_bMonitor(false),
+ m_iStandardLineTimeout(3),
+ m_iRetryLineTimeout(3),
+ m_iLastTransmission(0),
+ m_clientVersion(configuration->clientVersion)
+{
+ m_logicalAddresses.Clear();
+ CreateBusDevices();
+}
+
+CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress, cec_client_version clientVersion) :
+ m_bInitialised(false),
+ m_iPhysicalAddress(iPhysicalAddress),
m_iHDMIPort(CEC_DEFAULT_HDMI_PORT),
m_iBaseDevice((cec_logical_address)CEC_DEFAULT_BASE_DEVICE),
m_strDeviceName(strDeviceName),
m_bMonitor(false),
m_iStandardLineTimeout(3),
m_iRetryLineTimeout(3),
- m_iLastTransmission(0)
+ m_iLastTransmission(0),
+ m_clientVersion(clientVersion)
{
m_logicalAddresses.Clear();
+ CreateBusDevices();
+}
+
+void CCECProcessor::CreateBusDevices(void)
+{
for (int iPtr = 0; iPtr < 16; iPtr++)
{
switch(iPtr)
}
if (bReturn)
- CLibCEC::AddLog(CEC_LOG_NOTICE, "connected to the CEC adapter. firmware version = %d", m_communication->GetFirmwareVersion());
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "connected to the CEC adapter. firmware version = %d, client version = %s", m_communication->GetFirmwareVersion(), ToString(m_clientVersion));
return bReturn;
}
m_busDevices[CECDEVICE_TV]->RequestVendorId();
ReplaceHandlers();
- if ((bReturn = SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true)) == false)
+ if (m_iPhysicalAddress != 0)
+ {
+ m_busDevices[m_logicalAddresses.primary]->m_iPhysicalAddress = m_iPhysicalAddress;
+ if ((bReturn = m_busDevices[m_logicalAddresses.primary]->TransmitPhysicalAddress()) == false)
+ CLibCEC::AddLog(CEC_LOG_ERROR, "unable to set the physical address to %4x", m_iPhysicalAddress);
+ }
+ else if (m_iPhysicalAddress == 0 && (bReturn = SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true)) == false)
CLibCEC::AddLog(CEC_LOG_ERROR, "unable to set HDMI port %d on %s (%x)", m_iHDMIPort, ToString(m_iBaseDevice), (uint8_t)m_iBaseDevice);
SetInitialised(bReturn);
{
CLockObject lock(m_mutex);
+ m_iPhysicalAddress = iPhysicalAddress;
+
if (!m_logicalAddresses.IsEmpty())
{
bool bWasActiveSource(false);
}
}
+const char *CCECProcessor::ToString(const cec_client_version version)
+{
+ switch (version)
+ {
+ case CEC_CLIENT_VERSION_PRE_1_5:
+ return "pre-1.5";
+ case CEC_CLIENT_VERSION_1_5_0:
+ return "1.5.0";
+ default:
+ return "Unknown";
+ }
+}
+
void *CCECBusScan::Process(void)
{
CCECBusDevice *device(NULL);
// stream path changes are sent by the TV
return m_busDevices[CECDEVICE_TV]->GetHandler()->TransmitSetStreamPath(iPhysicalAddress);
}
+
+bool CCECProcessor::GetCurrentConfiguration(libcec_configuration *configuration)
+{
+ configuration->iPhysicalAddress = m_iPhysicalAddress;
+ configuration->iHDMIPort = m_iHDMIPort;
+ configuration->baseDevice = m_iBaseDevice;
+ snprintf(configuration->strDeviceName, 13, m_strDeviceName.c_str());
+ configuration->deviceTypes = m_types;
+ return true;
+}
+
+bool CCECProcessor::CanPersistConfiguration(void)
+{
+ return m_communication->GetFirmwareVersion() >= 2;
+}
+
+bool CCECProcessor::PersistConfiguration(libcec_configuration *configuration)
+{
+ return m_communication->PersistConfiguration(configuration);
+}