X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=3568c16fb8b18c1997b1ffb7d788c5a032da28c9;hb=44a1d92aaca0d0428673f5479152bb1994b40f61;hp=63009a87202617066ab8ef96227a83381d6790b2;hpb=ba73be2f178539d2dd9c289c1b54f3b1e3db50c3;p=deb_libcec.git diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 63009a8..3568c16 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -886,6 +886,8 @@ bool CCECProcessor::Transmit(const cec_command &data) uint8_t iMaxTries(0); { CLockObject lock(m_mutex); + if (IsStopped()) + return false; LogOutput(data); m_iLastTransmission = GetTimeMs(); if (!m_communication || !m_communication->IsOpen()) @@ -1363,6 +1365,8 @@ const char *CCECProcessor::ToString(const cec_vendor_id vendor) return "Philips"; case CEC_VENDOR_SONY: return "Sony"; + case CEC_VENDOR_TOSHIBA: + return "Toshiba"; default: return "Unknown"; } @@ -1562,10 +1566,10 @@ bool CCECProcessor::SetConfiguration(const libcec_configuration *configuration) if (bReinit) { - if (bDeviceTypeChanged) - return ChangeDeviceType(oldPrimaryType, m_configuration.deviceTypes[0]); - else if (bPhysicalAddressChanged) - return SetPhysicalAddress(m_configuration.iPhysicalAddress); + if (bDeviceTypeChanged) + return ChangeDeviceType(oldPrimaryType, m_configuration.deviceTypes[0]); + else if (bPhysicalAddressChanged) + return SetPhysicalAddress(m_configuration.iPhysicalAddress); else return SetHDMIPort(m_configuration.baseDevice, m_configuration.iHDMIPort); }