X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECAudioSystem.cpp;h=6d1d94827a50972c02f1c45c380952d6ab099dea;hb=55c75e6e4bd3d1c44907b59768b891227bd8ab5a;hp=a6d000f5eedfb11c8f196868988df1b75f565796;hpb=cf0ecd850f25db418c1127bab8927f0021abb017;p=deb_libcec.git

diff --git a/src/lib/devices/CECAudioSystem.cpp b/src/lib/devices/CECAudioSystem.cpp
index a6d000f..6d1d948 100644
--- a/src/lib/devices/CECAudioSystem.cpp
+++ b/src/lib/devices/CECAudioSystem.cpp
@@ -1,7 +1,7 @@
 /*
  * 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.
@@ -32,34 +32,107 @@
 
 #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)
+    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::TransmitAudioStatus(cec_logical_address dest)
+bool CCECAudioSystem::SetAudioStatus(uint8_t status)
 {
-  // TODO
-  CStdString strLog;
-  strLog.Format("<< %x -> %x: audio status feature abort", m_iLogicalAddress, dest);
-  AddLog(CEC_LOG_NOTICE, strLog);
+  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;
+  }
 
-  m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_AUDIO_STATUS);
   return false;
 }
 
-bool CCECAudioSystem::TransmitSystemAudioModeStatus(cec_logical_address dest)
+bool CCECAudioSystem::SetSystemAudioModeStatus(const cec_system_audio_status mode)
 {
-  // TODO
-  CStdString strLog;
-  strLog.Format("<< %x -> %x: system audio mode status feature abort", m_iLogicalAddress, dest);
-  AddLog(CEC_LOG_NOTICE, strLog);
+  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;
+  }
 
-  m_processor->TransmitAbort(dest, CEC_OPCODE_GIVE_SYSTEM_AUDIO_MODE_STATUS);
   return false;
 }
+
+bool CCECAudioSystem::TransmitAudioStatus(cec_logical_address dest)
+{
+  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;
+  }
+
+  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_handler->TransmitSetSystemAudioMode(m_iLogicalAddress, dest, state);
+}
+
+bool CCECAudioSystem::TransmitSystemAudioModeStatus(cec_logical_address dest)
+{
+  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);
+}
+
+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();
+
+  CLockObject lock(m_mutex);
+  return m_audioStatus;
+}