X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECAudioSystem.cpp;h=add3e6f3f6286137370a5d53fa3982012c8ce8d9;hb=ebcedb051be7d8e1e19ecd3f0aa164baae252400;hp=7824451c86f1b963191cd6b04df866e4a0843c69;hpb=0d800fe507054f9fc752ba70e5a9c14d95dcb87f;p=deb_libcec.git diff --git a/src/lib/devices/CECAudioSystem.cpp b/src/lib/devices/CECAudioSystem.cpp index 7824451..add3e6f 100644 --- a/src/lib/devices/CECAudioSystem.cpp +++ b/src/lib/devices/CECAudioSystem.cpp @@ -30,11 +30,13 @@ * http://www.pulse-eight.net/ */ +#include "env.h" #include "CECAudioSystem.h" -#include "../CECProcessor.h" -#include "../implementations/CECCommandHandler.h" -#include "../LibCEC.h" -#include "../CECTypeUtils.h" + +#include "lib/CECProcessor.h" +#include "lib/implementations/CECCommandHandler.h" +#include "lib/LibCEC.h" +#include "lib/CECTypeUtils.h" using namespace CEC; using namespace PLATFORM; @@ -76,40 +78,40 @@ bool CCECAudioSystem::SetSystemAudioModeStatus(const cec_system_audio_status mod return false; } -bool CCECAudioSystem::TransmitAudioStatus(cec_logical_address dest) +bool CCECAudioSystem::TransmitAudioStatus(cec_logical_address dest, bool bIsReply) { uint8_t state; { CLockObject lock(m_mutex); - LIB_CEC->AddLog(CEC_LOG_NOTICE, "<< %x -> %x: audio status '%2x'", m_iLogicalAddress, dest, m_audioStatus); + LIB_CEC->AddLog(CEC_LOG_DEBUG, "<< %x -> %x: audio status '%2x'", m_iLogicalAddress, dest, m_audioStatus); state = m_audioStatus; } - return m_handler->TransmitAudioStatus(m_iLogicalAddress, dest, state); + return m_handler->TransmitAudioStatus(m_iLogicalAddress, dest, state, bIsReply); } -bool CCECAudioSystem::TransmitSetSystemAudioMode(cec_logical_address dest) +bool CCECAudioSystem::TransmitSetSystemAudioMode(cec_logical_address dest, bool bIsReply) { cec_system_audio_status state; { CLockObject lock(m_mutex); - LIB_CEC->AddLog(CEC_LOG_NOTICE, "<< %x -> %x: set system audio mode '%2x'", m_iLogicalAddress, dest, m_audioStatus); + LIB_CEC->AddLog(CEC_LOG_DEBUG, "<< %x -> %x: set system audio mode '%2x'", m_iLogicalAddress, dest, m_audioStatus); state = m_systemAudioStatus; } - return m_handler->TransmitSetSystemAudioMode(m_iLogicalAddress, dest, state); + return m_handler->TransmitSetSystemAudioMode(m_iLogicalAddress, dest, state, bIsReply); } -bool CCECAudioSystem::TransmitSystemAudioModeStatus(cec_logical_address dest) +bool CCECAudioSystem::TransmitSystemAudioModeStatus(cec_logical_address dest, bool bIsReply) { cec_system_audio_status state; { CLockObject lock(m_mutex); - LIB_CEC->AddLog(CEC_LOG_NOTICE, "<< %x -> %x: system audio mode '%s'", m_iLogicalAddress, dest, ToString(m_systemAudioStatus)); + LIB_CEC->AddLog(CEC_LOG_DEBUG, "<< %x -> %x: system audio mode '%s'", m_iLogicalAddress, dest, ToString(m_systemAudioStatus)); state = m_systemAudioStatus; } - return m_handler->TransmitSystemAudioModeStatus(m_iLogicalAddress, dest, state); + return m_handler->TransmitSystemAudioModeStatus(m_iLogicalAddress, dest, state, bIsReply); } uint8_t CCECAudioSystem::VolumeUp(const cec_logical_address source, bool bSendRelease /* = true */)