/*
* 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-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.
* http://www.pulse-eight.net/
*/
+#include "env.h"
#include "CECAudioSystem.h"
-#include "../CECProcessor.h"
-#include "../implementations/CECCommandHandler.h"
+
+#include "lib/CECProcessor.h"
+#include "lib/implementations/CECCommandHandler.h"
+#include "lib/LibCEC.h"
+#include "lib/CECTypeUtils.h"
using namespace CEC;
+using namespace PLATFORM;
+
+#define LIB_CEC m_processor->GetLib()
+#define ToString(p) CCECTypeUtils::ToString(p)
-CCECAudioSystem::CCECAudioSystem(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress /* = 0 */) :
+CCECAudioSystem::CCECAudioSystem(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress /* = CEC_INVALID_PHYSICAL_ADDRESS */) :
CCECBusDevice(processor, address, iPhysicalAddress),
m_systemAudioStatus(CEC_SYSTEM_AUDIO_STATUS_ON),
- m_audioStatus(CEC_AUDIO_MUTE_STATUS_MASK)
+ m_audioStatus(CEC_AUDIO_VOLUME_STATUS_UNKNOWN)
{
m_type = CEC_DEVICE_TYPE_AUDIO_SYSTEM;
}
bool CCECAudioSystem::SetAudioStatus(uint8_t status)
{
- CLockObject lock(&m_writeMutex);
+ CLockObject lock(m_mutex);
if (m_audioStatus != status)
{
- CStdString strLog;
- strLog.Format(">> %s (%X): audio status changed from %2x to %2x", GetLogicalAddressName(), m_iLogicalAddress, m_audioStatus, status);
- AddLog(CEC_LOG_DEBUG, strLog.c_str());
-
+ LIB_CEC->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_system_audio_status mode)
+bool CCECAudioSystem::SetSystemAudioModeStatus(const cec_system_audio_status mode)
{
- CLockObject lock(&m_writeMutex);
+ CLockObject lock(m_mutex);
if (m_systemAudioStatus != mode)
{
- CStdString strLog;
- strLog.Format(">> %s (%X): system audio mode changed from %s to %s", GetLogicalAddressName(), m_iLogicalAddress, CCECCommandHandler::ToString(m_systemAudioStatus), CCECCommandHandler::ToString(mode));
- AddLog(CEC_LOG_DEBUG, strLog.c_str());
-
+ LIB_CEC->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 false;
}
-bool CCECAudioSystem::SetSystemAudioMode(const cec_command &command)
+bool CCECAudioSystem::TransmitAudioStatus(cec_logical_address dest, bool bIsReply)
{
- SetSystemAudioMode((command.parameters.size == 0) ?
- CEC_SYSTEM_AUDIO_STATUS_OFF :
- CEC_SYSTEM_AUDIO_STATUS_ON);
+ uint8_t state;
+ {
+ CLockObject lock(m_mutex);
+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "<< %x -> %x: audio status '%2x'", m_iLogicalAddress, dest, m_audioStatus);
+ state = m_audioStatus;
+ }
- return TransmitAudioStatus(command.initiator);
+ return m_handler->TransmitAudioStatus(m_iLogicalAddress, dest, state, bIsReply);
}
-bool CCECAudioSystem::TransmitAudioStatus(cec_logical_address dest)
+bool CCECAudioSystem::TransmitSetSystemAudioMode(cec_logical_address dest, bool bIsReply)
{
- CLockObject lock(&m_writeMutex);
- CStdString strLog;
- strLog.Format("<< %x -> %x: audio status '%2x'", m_iLogicalAddress, dest, m_audioStatus);
- AddLog(CEC_LOG_NOTICE, strLog);
-
- cec_command command;
- cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_REPORT_AUDIO_STATUS);
- command.parameters.PushBack(m_audioStatus);
+ cec_system_audio_status state;
+ {
+ CLockObject lock(m_mutex);
+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "<< %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, bIsReply);
}
-bool CCECAudioSystem::TransmitSystemAudioModeStatus(cec_logical_address dest)
+bool CCECAudioSystem::TransmitSystemAudioModeStatus(cec_logical_address dest, bool bIsReply)
{
- CLockObject lock(&m_writeMutex);
- CStdString strLog;
- strLog.Format("<< %x -> %x: system audio mode '%s'", m_iLogicalAddress, dest, CCECCommandHandler::ToString(m_systemAudioStatus));
- AddLog(CEC_LOG_NOTICE, strLog);
-
- cec_command command;
- cec_command::Format(command, m_iLogicalAddress, dest, CEC_OPCODE_SYSTEM_AUDIO_MODE_STATUS);
- command.parameters.PushBack((uint8_t) m_systemAudioStatus);
+ cec_system_audio_status state;
+ {
+ CLockObject lock(m_mutex);
+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "<< %x -> %x: system audio mode '%s'", m_iLogicalAddress, dest, ToString(m_systemAudioStatus));
+ state = m_systemAudioStatus;
+ }
- return m_processor->Transmit(command);
+ return m_handler->TransmitSystemAudioModeStatus(m_iLogicalAddress, dest, state, bIsReply);
}
-uint8_t CCECAudioSystem::VolumeUp(bool bWait /* = true */)
+uint8_t CCECAudioSystem::VolumeUp(const cec_logical_address source, bool bSendRelease /* = true */)
{
- if (SendKeypress(CEC_USER_CONTROL_CODE_VOLUME_UP))
- SendKeyRelease(bWait);
+ TransmitKeypress(source, CEC_USER_CONTROL_CODE_VOLUME_UP);
+ if (bSendRelease)
+ TransmitKeyRelease(source);
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
return m_audioStatus;
}
-uint8_t CCECAudioSystem::VolumeDown(bool bWait /* = true */)
+uint8_t CCECAudioSystem::VolumeDown(const cec_logical_address source, bool bSendRelease /* = true */)
{
- if (SendKeypress(CEC_USER_CONTROL_CODE_VOLUME_DOWN))
- SendKeyRelease(bWait);
+ TransmitKeypress(source, CEC_USER_CONTROL_CODE_VOLUME_DOWN);
+ if (bSendRelease)
+ TransmitKeyRelease(source);
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
return m_audioStatus;
}
-uint8_t CCECAudioSystem::MuteAudio(bool bWait /* = true */)
+uint8_t CCECAudioSystem::MuteAudio(const cec_logical_address source)
{
- if (SendKeypress(CEC_USER_CONTROL_CODE_MUTE))
- SendKeyRelease(bWait);
+ TransmitKeypress(source, CEC_USER_CONTROL_CODE_MUTE);
+ TransmitKeyRelease(source);
+
+ return GetAudioStatus(source, true);
+}
+
+bool CCECAudioSystem::RequestAudioStatus(const cec_logical_address initiator, bool bWaitForResponse /* = true */)
+{
+ bool bReturn(false);
+
+ if (!IsHandledByLibCEC() &&
+ !IsUnsupportedFeature(CEC_OPCODE_GIVE_AUDIO_STATUS))
+ {
+ MarkBusy();
+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "<< requesting audio status of '%s' (%X)", GetLogicalAddressName(), m_iLogicalAddress);
+ bReturn = m_handler->TransmitRequestAudioStatus(initiator, m_iLogicalAddress, bWaitForResponse);
+ MarkReady();
+ }
+ return bReturn;
+}
+
+uint8_t CCECAudioSystem::GetAudioStatus(const cec_logical_address initiator, bool bUpdate /* = false */)
+{
+ bool bIsPresent(GetStatus() == CEC_DEVICE_STATUS_PRESENT);
+ bool bRequestUpdate(false);
+ {
+ CLockObject lock(m_mutex);
+ bRequestUpdate = bIsPresent &&
+ (bUpdate || m_audioStatus == CEC_AUDIO_VOLUME_STATUS_UNKNOWN);
+ }
+
+ if (bRequestUpdate)
+ {
+ CheckVendorIdRequested(initiator);
+ RequestAudioStatus(initiator);
+ }
- CLockObject lock(&m_mutex);
+ CLockObject lock(m_mutex);
return m_audioStatus;
}
repositories / deb_libcec.git / blobdiff