X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECPlaybackDevice.cpp;h=200ffa4d4bea177d9fb672b247b2bf7c6aadf0dc;hb=03ae897d74d37f6fdb35e2bb937e851cee61793b;hp=d1b1e5112da13d1e87fd8d3b0a6e6c559f1a1c0e;hpb=f46dc8465450028c44c7cb0c253ab8b06dc1bcf4;p=deb_libcec.git diff --git a/src/lib/devices/CECPlaybackDevice.cpp b/src/lib/devices/CECPlaybackDevice.cpp index d1b1e51..200ffa4 100644 --- a/src/lib/devices/CECPlaybackDevice.cpp +++ b/src/lib/devices/CECPlaybackDevice.cpp @@ -36,6 +36,8 @@ using namespace CEC; +#define ToString(p) m_processor->ToString(p) + CCECPlaybackDevice::CCECPlaybackDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress /* = 0 */) : CCECBusDevice(processor, address, iPhysicalAddress), m_deckStatus(CEC_DECK_INFO_STOP), @@ -56,7 +58,7 @@ void CCECPlaybackDevice::SetDeckStatus(cec_deck_info deckStatus) if (m_deckStatus != deckStatus) { CStdString strLog; - strLog.Format(">> %s (%X): deck status changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(m_deckStatus), CCECCommandHandler::ToString(deckStatus)); + strLog.Format(">> %s (%X): deck status changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_deckStatus), ToString(deckStatus)); AddLog(CEC_LOG_DEBUG, strLog.c_str()); m_deckStatus = deckStatus; @@ -75,7 +77,7 @@ void CCECPlaybackDevice::SetDeckControlMode(cec_deck_control_mode mode) if (m_deckControlMode != mode) { CStdString strLog; - strLog.Format(">> %s (%X): deck control mode changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(m_deckControlMode), CCECCommandHandler::ToString(mode)); + strLog.Format(">> %s (%X): deck control mode changed from '%s' to '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_deckControlMode), ToString(mode)); AddLog(CEC_LOG_DEBUG, strLog.c_str()); m_deckControlMode = mode; @@ -86,7 +88,7 @@ bool CCECPlaybackDevice::TransmitDeckStatus(cec_logical_address dest) { CLockObject lock(&m_writeMutex); CStdString strLog; - strLog.Format("<< %s (%X) -> %s (%X): deck status '%s'", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(dest), dest, CCECCommandHandler::ToString(m_deckStatus)); + strLog.Format("<< %s (%X) -> %s (%X): deck status '%s'", GetLogicalAddressName(), m_iLogicalAddress, ToString(dest), dest, ToString(m_deckStatus)); AddLog(CEC_LOG_NOTICE, strLog); cec_command command;