/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
#include "CECAudioSystem.h"
#include "../CECProcessor.h"
+#include "../implementations/CECCommandHandler.h"
+#include "../LibCEC.h"
using namespace CEC;
+using namespace PLATFORM;
+
+#define ToString(p) m_processor->ToString(p)
CCECAudioSystem::CCECAudioSystem(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress /* = 0 */) :
CCECBusDevice(processor, address, iPhysicalAddress),
m_systemAudioStatus(CEC_SYSTEM_AUDIO_STATUS_ON),
m_audioStatus(CEC_AUDIO_MUTE_STATUS_MASK)
{
- m_type = CEC_DEVICE_TYPE_AUDIO_SYSTEM;
- m_strDeviceName = "Audio";
+ m_type = CEC_DEVICE_TYPE_AUDIO_SYSTEM;
+}
+
+bool CCECAudioSystem::SetAudioStatus(uint8_t status)
+{
+ CLockObject lock(m_mutex);
+ if (m_audioStatus != status)
+ {
+ CLibCEC::AddLog(CEC_LOG_DEBUG, ">> %s (%X): audio status changed from %2x to %2x", GetLogicalAddressName(), m_iLogicalAddress, m_audioStatus, status);
+ m_audioStatus = status;
+ return true;
+ }
+
+ return false;
}
-bool CCECAudioSystem::SetSystemAudioMode(const cec_command &command)
+bool CCECAudioSystem::SetSystemAudioModeStatus(const cec_system_audio_status mode)
{
- m_systemAudioStatus = (command.parameters.size == 0) ?
- CEC_SYSTEM_AUDIO_STATUS_OFF :
- CEC_SYSTEM_AUDIO_STATUS_ON;
+ CLockObject lock(m_mutex);
+ if (m_systemAudioStatus != mode)
+ {
+ CLibCEC::AddLog(CEC_LOG_DEBUG, ">> %s (%X): system audio mode status changed from %s to %s", GetLogicalAddressName(), m_iLogicalAddress, ToString(m_systemAudioStatus), ToString(mode));
+ m_systemAudioStatus = mode;
+ return true;
+ }
- return TransmitAudioStatus(command.initiator);
+ return false;
}
bool CCECAudioSystem::TransmitAudioStatus(cec_logical_address dest)
{
- CStdString strLog;
- strLog.Format("<< %x -> %x: audio status '%2x'", m_iLogicalAddress, dest, m_audioStatus);
- AddLog(CEC_LOG_NOTICE, strLog);
+ uint8_t state;
+ {
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "<< %x -> %x: audio status '%2x'", m_iLogicalAddress, dest, m_audioStatus);
+ state = m_audioStatus;
+ }
- cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_AUDIO_STATUS);
- command.parameters.push_back((uint8_t) m_audioStatus);
+ return m_handler->TransmitAudioStatus(m_iLogicalAddress, dest, state);
+}
+
+bool CCECAudioSystem::TransmitSetSystemAudioMode(cec_logical_address dest)
+{
+ cec_system_audio_status state;
+ {
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "<< %x -> %x: set system audio mode '%2x'", m_iLogicalAddress, dest, m_audioStatus);
+ state = m_systemAudioStatus;
+ }
- return m_processor->Transmit(command);
+ return m_handler->TransmitSetSystemAudioMode(m_iLogicalAddress, dest, state);
}
bool CCECAudioSystem::TransmitSystemAudioModeStatus(cec_logical_address dest)
{
- CStdString strLog;
- strLog.Format("<< %x -> %x: system audio mode '%2x'", m_iLogicalAddress, dest, m_systemAudioStatus);
- AddLog(CEC_LOG_NOTICE, strLog);
+ cec_system_audio_status state;
+ {
+ CLockObject lock(m_mutex);
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "<< %x -> %x: system audio mode '%s'", m_iLogicalAddress, dest, ToString(m_systemAudioStatus));
+ state = m_systemAudioStatus;
+ }
+
+ return m_handler->TransmitSystemAudioModeStatus(m_iLogicalAddress, dest, state);
+}
- cec_command command;
- cec_command::format(command, m_iLogicalAddress, dest, CEC_OPCODE_SYSTEM_AUDIO_MODE_STATUS);
- command.parameters.push_back((uint8_t) m_systemAudioStatus);
+uint8_t CCECAudioSystem::VolumeUp(bool bSendRelease /* = true */)
+{
+ if (TransmitKeypress(CEC_USER_CONTROL_CODE_VOLUME_UP) && bSendRelease)
+ TransmitKeyRelease();
+
+ CLockObject lock(m_mutex);
+ return m_audioStatus;
+}
+
+uint8_t CCECAudioSystem::VolumeDown(bool bSendRelease /* = true */)
+{
+ if (TransmitKeypress(CEC_USER_CONTROL_CODE_VOLUME_DOWN) && bSendRelease)
+ TransmitKeyRelease();
+
+ CLockObject lock(m_mutex);
+ return m_audioStatus;
+}
+
+uint8_t CCECAudioSystem::MuteAudio(bool bSendRelease /* = true */)
+{
+ if (TransmitKeypress(CEC_USER_CONTROL_CODE_MUTE) && bSendRelease)
+ TransmitKeyRelease();
- return m_processor->Transmit(command);
+ CLockObject lock(m_mutex);
+ return m_audioStatus;
}