X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECPlaybackDevice.cpp;h=a4df0acc159d1cc9f7999f685ba36a66f4773c5d;hb=5ce88432714dbc3ff38f93227d84da5ff88b6781;hp=d1ac742c0ec39d4673c7dd343ea327fdffb3a014;hpb=cc938f166e50b0c9e4fdccf55e0a8cffb2c56602;p=deb_libcec.git diff --git a/src/lib/devices/CECPlaybackDevice.cpp b/src/lib/devices/CECPlaybackDevice.cpp index d1ac742..a4df0ac 100644 --- a/src/lib/devices/CECPlaybackDevice.cpp +++ b/src/lib/devices/CECPlaybackDevice.cpp @@ -1,7 +1,7 @@ /* * This file is part of the libCEC(R) library. * - * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved. + * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. * libCEC(R) is an original work, containing original code. * * libCEC(R) is a trademark of Pulse-Eight Limited. @@ -30,15 +30,18 @@ * http://www.pulse-eight.net/ */ +#include "env.h" #include "CECPlaybackDevice.h" -#include "../implementations/CECCommandHandler.h" -#include "../CECProcessor.h" -#include "../LibCEC.h" + +#include "lib/implementations/CECCommandHandler.h" +#include "lib/CECProcessor.h" +#include "lib/LibCEC.h" +#include "lib/CECTypeUtils.h" using namespace CEC; using namespace PLATFORM; -#define ToString(p) m_processor->GetLib()->ToString(p) +#define ToString(p) CCECTypeUtils::ToString(p) CCECPlaybackDevice::CCECPlaybackDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress /* = CEC_INVALID_PHYSICAL_ADDRESS */) : CCECBusDevice(processor, address, iPhysicalAddress), @@ -80,16 +83,16 @@ void CCECPlaybackDevice::SetDeckControlMode(cec_deck_control_mode mode) } } -bool CCECPlaybackDevice::TransmitDeckStatus(cec_logical_address dest) +bool CCECPlaybackDevice::TransmitDeckStatus(cec_logical_address dest, bool bIsReply) { cec_deck_info state; { CLockObject lock(m_mutex); - m_processor->GetLib()->AddLog(CEC_LOG_NOTICE, "<< %s (%X) -> %s (%X): deck status '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_deckStatus)); + m_processor->GetLib()->AddLog(CEC_LOG_DEBUG, "<< %s (%X) -> %s (%X): deck status '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_deckStatus)); state = m_deckStatus; } - return m_handler->TransmitDeckStatus(m_iLogicalAddress, dest, state); + return m_handler->TransmitDeckStatus(m_iLogicalAddress, dest, state, bIsReply); } void CCECPlaybackDevice::ResetDeviceStatus(void)