X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=54162b92257f9f4e6f1fa9e6517009c46b87c4e2;hb=6bbfc3f7460c5806ffd80834b3c3c68e0738a2d5;hp=20b8e059f329f210400fd9570af8c0c5f571fa25;hpb=f0154449cd90ee3af52a50637652d08968554275;p=deb_libcec.git diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 20b8e05..54162b9 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -47,7 +47,7 @@ using namespace CEC; using namespace std; using namespace PLATFORM; -CCECProcessor::CCECProcessor(CLibCEC *controller, const libcec_configuration *configuration) : +CCECProcessor::CCECProcessor(CLibCEC *controller, libcec_configuration *configuration) : m_bInitialised(false), m_communication(NULL), m_controller(controller), @@ -59,14 +59,16 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const libcec_configuration *co m_logicalAddresses.Clear(); CreateBusDevices(); m_configuration.Clear(); - + m_configuration.serverVersion = CEC_SERVER_VERSION_1_5_0; SetConfiguration(configuration); if (m_configuration.tvVendor != CEC_VENDOR_UNKNOWN) m_busDevices[CECDEVICE_TV]->ReplaceHandler(false); + + GetCurrentConfiguration(configuration); } -CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress, cec_client_version clientVersion) : +CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress) : m_bInitialised(false), m_communication(NULL), m_controller(controller), @@ -76,9 +78,10 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con m_iLastTransmission(0) { m_configuration.Clear(); + m_configuration.serverVersion = CEC_SERVER_VERSION_1_5_0; // client version < 1.5.0 - m_configuration.clientVersion = clientVersion; + m_configuration.clientVersion = (uint32_t)CEC_CLIENT_VERSION_PRE_1_5; snprintf(m_configuration.strDeviceName, 13, "%s", strDeviceName); m_configuration.deviceTypes = types; m_configuration.iPhysicalAddress = iPhysicalAddress; @@ -136,6 +139,8 @@ CCECProcessor::~CCECProcessor(void) void CCECProcessor::Close(void) { + StopThread(false); + SetInitialised(false); StopThread(); CLockObject lock(m_mutex); @@ -180,7 +185,7 @@ bool CCECProcessor::OpenConnection(const char *strPort, uint16_t iBaudRate, uint } if (bReturn) - CLibCEC::AddLog(CEC_LOG_NOTICE, "connected to the CEC adapter. firmware version = %d, client version = %s", m_communication->GetFirmwareVersion(), ToString(m_configuration.clientVersion)); + CLibCEC::AddLog(CEC_LOG_NOTICE, "connected to the CEC adapter. firmware version = %d, client version = %s", m_communication->GetFirmwareVersion(), ToString((cec_client_version)m_configuration.clientVersion)); return bReturn; } @@ -228,8 +233,6 @@ bool CCECProcessor::Initialise(void) else if (m_configuration.iPhysicalAddress == 0 && (bReturn = SetHDMIPort(m_configuration.baseDevice, m_configuration.iHDMIPort, true)) == false) CLibCEC::AddLog(CEC_LOG_ERROR, "unable to set HDMI port %d on %s (%x)", m_configuration.iHDMIPort, ToString(m_configuration.baseDevice), (uint8_t)m_configuration.baseDevice); - PowerOnDevices(); - SetInitialised(bReturn); CLibCEC::ConfigurationChanged(m_configuration); @@ -510,6 +513,7 @@ void CCECProcessor::SetRetryLineTimeout(uint8_t iTimeout) bool CCECProcessor::SetActiveView(void) { + CLibCEC::AddLog(CEC_LOG_WARNING, "deprecated method %s called", __FUNCTION__); return SetActiveSource(m_configuration.deviceTypes.IsEmpty() ? CEC_DEVICE_TYPE_RESERVED : m_configuration.deviceTypes[0]); } @@ -548,10 +552,14 @@ bool CCECProcessor::SetDeckInfo(cec_deck_info info, bool bSendUpdate /* = true * bool CCECProcessor::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, bool bForce /* = false */) { bool bReturn(false); - CLockObject lock(m_mutex); - m_configuration.baseDevice = iBaseDevice; - m_configuration.iHDMIPort = iPort; + { + CLockObject lock(m_mutex); + m_configuration.baseDevice = iBaseDevice; + m_configuration.iHDMIPort = iPort; + m_configuration.bAutodetectAddress = false; + } + if (!IsRunning() && !bForce) return true; @@ -560,9 +568,7 @@ bool CCECProcessor::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, uint16_t iPhysicalAddress(0); if (iBaseDevice > CECDEVICE_TV) { - lock.Unlock(); iPhysicalAddress = m_busDevices[iBaseDevice]->GetPhysicalAddress(); - lock.Lock(); } if (iPhysicalAddress < 0xffff) @@ -582,10 +588,7 @@ bool CCECProcessor::SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, if (!bReturn) CLibCEC::AddLog(CEC_LOG_ERROR, "failed to set the physical address"); else - { - lock.Unlock(); SetPhysicalAddress(iPhysicalAddress); - } return bReturn; } @@ -660,6 +663,11 @@ bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress, bool bSendUpda { CLockObject lock(m_mutex); m_configuration.iPhysicalAddress = iPhysicalAddress; + if (m_configuration.bAutodetectAddress) + { + m_configuration.baseDevice = CECDEVICE_UNKNOWN; + m_configuration.iHDMIPort = 0; + } if (!m_logicalAddresses.IsEmpty()) { @@ -853,13 +861,22 @@ bool CCECProcessor::IsActiveSource(cec_logical_address iAddress) bool CCECProcessor::Transmit(const cec_command &data) { + if (m_logicalAddresses[(uint8_t)data.destination]) + { + CLibCEC::AddLog(CEC_LOG_WARNING, "not sending data to myself!"); + return false; + } + cec_adapter_message_state retVal(ADAPTER_MESSAGE_STATE_UNKNOWN); { CLockObject lock(m_mutex); LogOutput(data); m_iLastTransmission = GetTimeMs(); - if (!m_communication) + if (!m_communication || !m_communication->IsOpen()) + { + CLibCEC::AddLog(CEC_LOG_ERROR, "cannot transmit command: connection closed"); return false; + } uint8_t iMaxTries = m_busDevices[data.initiator]->GetHandler()->GetTransmitRetries() + 1; retVal = m_communication->Write(data, iMaxTries, m_iLineTimeout, m_iRetryLineTimeout); } @@ -947,6 +964,21 @@ bool CCECProcessor::TransmitKeyRelease(cec_logical_address iDestination, bool bW return m_busDevices[iDestination]->TransmitKeyRelease(bWait); } +bool CCECProcessor::EnablePhysicalAddressDetection(void) +{ + CLibCEC::AddLog(CEC_LOG_WARNING, "deprecated method %s called", __FUNCTION__); + uint16_t iPhysicalAddress = m_communication->GetPhysicalAddress(); + if (iPhysicalAddress != 0) + { + m_configuration.bAutodetectAddress = 1; + m_configuration.iPhysicalAddress = iPhysicalAddress; + m_configuration.baseDevice = CECDEVICE_UNKNOWN; + m_configuration.iHDMIPort = 0; + return SetPhysicalAddress(iPhysicalAddress); + } + return false; +} + bool CCECProcessor::StandbyDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */) { if (address == CECDEVICE_BROADCAST && m_configuration.clientVersion >= CEC_CLIENT_VERSION_1_5_0) @@ -1336,6 +1368,19 @@ const char *CCECProcessor::ToString(const cec_client_version version) } } +const char *CCECProcessor::ToString(const cec_server_version version) +{ + switch (version) + { + case CEC_SERVER_VERSION_PRE_1_5: + return "pre-1.5"; + case CEC_SERVER_VERSION_1_5_0: + return "1.5.0"; + default: + return "Unknown"; + } +} + void *CCECBusScan::Process(void) { CCECBusDevice *device(NULL); @@ -1410,9 +1455,6 @@ bool CCECProcessor::SetStreamPath(uint16_t iPhysicalAddress) bool CCECProcessor::SetConfiguration(const libcec_configuration *configuration) { bool bReinit(false); - bool bPhysicalAddressChanged(false); - bool bHdmiPortChanged(false); - bool bDeviceTypeChanged(false); CCECBusDevice *primary = IsRunning() ? GetPrimaryDevice() : NULL; cec_device_type oldPrimaryType = primary ? primary->GetType() : CEC_DEVICE_TYPE_RECORDING_DEVICE; m_configuration.clientVersion = configuration->clientVersion; @@ -1420,22 +1462,54 @@ bool CCECProcessor::SetConfiguration(const libcec_configuration *configuration) // client version 1.5.0 // device types - bDeviceTypeChanged |= IsRunning () && m_configuration.deviceTypes != configuration->deviceTypes; + bool bDeviceTypeChanged = IsRunning () && m_configuration.deviceTypes != configuration->deviceTypes; m_configuration.deviceTypes = configuration->deviceTypes; + // autodetect address + uint16_t iPhysicalAddress = IsRunning() && configuration->bAutodetectAddress ? m_communication->GetPhysicalAddress() : 0; + bool bPhysicalAutodetected = IsRunning() && configuration->bAutodetectAddress && iPhysicalAddress != m_configuration.iPhysicalAddress && iPhysicalAddress != 0; + if (bPhysicalAutodetected) + { + m_configuration.iPhysicalAddress = iPhysicalAddress; + m_configuration.bAutodetectAddress = true; + } + else + { + m_configuration.bAutodetectAddress = false; + } + // physical address - bPhysicalAddressChanged |= IsRunning() && m_configuration.iPhysicalAddress != configuration->iPhysicalAddress; - m_configuration.iPhysicalAddress = configuration->iPhysicalAddress; + bool bPhysicalAddressChanged(false); + if (!bPhysicalAutodetected) + { + bPhysicalAddressChanged = IsRunning() && m_configuration.iPhysicalAddress != configuration->iPhysicalAddress; + m_configuration.iPhysicalAddress = configuration->iPhysicalAddress; + } // base device - bHdmiPortChanged |= IsRunning() && m_configuration.baseDevice != configuration->baseDevice; - m_configuration.baseDevice = configuration->baseDevice; + bool bHdmiPortChanged(false); + if (!bPhysicalAutodetected && !bPhysicalAddressChanged) + { + bHdmiPortChanged = IsRunning() && m_configuration.baseDevice != configuration->baseDevice; + m_configuration.baseDevice = configuration->baseDevice; + } + else + { + m_configuration.baseDevice = CECDEVICE_UNKNOWN; + } // hdmi port - bHdmiPortChanged |= IsRunning() && m_configuration.iHDMIPort != configuration->iHDMIPort; - m_configuration.iHDMIPort = configuration->iHDMIPort; + if (!bPhysicalAutodetected && !bPhysicalAddressChanged) + { + bHdmiPortChanged |= IsRunning() && m_configuration.iHDMIPort != configuration->iHDMIPort; + m_configuration.iHDMIPort = configuration->iHDMIPort; + } + else + { + m_configuration.iHDMIPort = 0; + } - bReinit = bPhysicalAddressChanged || bHdmiPortChanged || bDeviceTypeChanged; + bReinit = bPhysicalAddressChanged || bHdmiPortChanged || bDeviceTypeChanged || bPhysicalAutodetected; // device name snprintf(m_configuration.strDeviceName, 13, "%s", configuration->strDeviceName); @@ -1462,6 +1536,8 @@ bool CCECProcessor::SetConfiguration(const libcec_configuration *configuration) } // just copy these + m_configuration.clientVersion = configuration->clientVersion; + m_configuration.bActivateSource = configuration->bActivateSource; m_configuration.bGetSettingsFromROM = configuration->bGetSettingsFromROM; m_configuration.powerOffDevices = configuration->powerOffDevices; m_configuration.bPowerOffScreensaver = configuration->bPowerOffScreensaver; @@ -1477,7 +1553,7 @@ bool CCECProcessor::SetConfiguration(const libcec_configuration *configuration) return ChangeDeviceType(oldPrimaryType, m_configuration.deviceTypes[0]); else if (bPhysicalAddressChanged) return SetPhysicalAddress(m_configuration.iPhysicalAddress); - else + else return SetHDMIPort(m_configuration.baseDevice, m_configuration.iHDMIPort); } @@ -1487,15 +1563,20 @@ bool CCECProcessor::SetConfiguration(const libcec_configuration *configuration) bool CCECProcessor::GetCurrentConfiguration(libcec_configuration *configuration) { // client version 1.5.0 - configuration->clientVersion = m_configuration.clientVersion; snprintf(configuration->strDeviceName, 13, "%s", m_configuration.strDeviceName); configuration->deviceTypes = m_configuration.deviceTypes; + configuration->bAutodetectAddress = m_configuration.bAutodetectAddress; configuration->iPhysicalAddress = m_configuration.iPhysicalAddress; configuration->baseDevice = m_configuration.baseDevice; configuration->iHDMIPort = m_configuration.iHDMIPort; + configuration->clientVersion = m_configuration.clientVersion; + configuration->serverVersion = m_configuration.serverVersion; configuration->tvVendor = m_configuration.tvVendor; - configuration->wakeDevices = m_configuration.wakeDevices; + configuration->bGetSettingsFromROM = m_configuration.bGetSettingsFromROM; + configuration->bUseTVMenuLanguage = m_configuration.bUseTVMenuLanguage; + configuration->bActivateSource = m_configuration.bActivateSource; + configuration->wakeDevices = m_configuration.wakeDevices; configuration->powerOffDevices = m_configuration.powerOffDevices; configuration->bPowerOffScreensaver = m_configuration.bPowerOffScreensaver; configuration->bPowerOffOnStandby = m_configuration.bPowerOffOnStandby; @@ -1512,3 +1593,9 @@ bool CCECProcessor::PersistConfiguration(libcec_configuration *configuration) { return m_communication->PersistConfiguration(configuration); } + +void CCECProcessor::RescanActiveDevices(void) +{ + for (unsigned int iPtr = 0; iPtr < 16; iPtr++) + m_busDevices[iPtr]->GetStatus(true); +}