X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FLibCEC.cpp;h=ab252906686d020538e98649a29561e67f7316ae;hb=ad24cbafd0d19690668323cc8368e7d8f925a667;hp=7c0f7927956126f088a9bb5ec443f9c04ebe086b;hpb=6710d300ded40bf47eef036513b757bf3b8651a7;p=deb_libcec.git diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp index 7c0f792..ab25290 100644 --- a/src/lib/LibCEC.cpp +++ b/src/lib/LibCEC.cpp @@ -35,6 +35,7 @@ #include "AdapterCommunication.h" #include "AdapterDetection.h" #include "CECProcessor.h" +#include "devices/CECBusDevice.h" #include "util/StdString.h" #include "platform/timeutils.h" @@ -175,12 +176,12 @@ bool CLibCEC::SetPhysicalAddress(uint16_t iPhysicalAddress) bool CLibCEC::PowerOnDevices(cec_logical_address address /* = CECDEVICE_TV */) { - return m_cec ? m_cec->PowerOnDevices(address) : false; + return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->m_busDevices[(uint8_t)address]->PowerOn() : false; } bool CLibCEC::StandbyDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */) { - return m_cec ? m_cec->StandbyDevices(address) : false; + return m_cec && address >= CECDEVICE_TV && address <= CECDEVICE_BROADCAST ? m_cec->m_busDevices[(uint8_t)address]->Standby() : false; } bool CLibCEC::SetActiveView(void) @@ -195,7 +196,12 @@ bool CLibCEC::SetInactiveView(void) bool CLibCEC::SetOSDString(cec_logical_address iLogicalAddress, cec_display_control duration, const char *strMessage) { - return m_cec ? m_cec->SetOSDString(iLogicalAddress, duration, strMessage) : false; + return m_cec && iLogicalAddress >= CECDEVICE_TV && iLogicalAddress <= CECDEVICE_BROADCAST ? m_cec->m_busDevices[(uint8_t)iLogicalAddress]->SetOSDString(duration, strMessage) : false; +} + +bool CLibCEC::SwitchMonitoring(bool bEnable) +{ + return m_cec ? m_cec->SwitchMonitoring(bEnable) : false; } void CLibCEC::AddLog(cec_log_level level, const string &strMessage) @@ -224,7 +230,7 @@ void CLibCEC::AddKey(void) } } -void CLibCEC::AddCommand(cec_command &command) +void CLibCEC::AddCommand(const cec_command &command) { if (m_commandBuffer.Push(command)) {