X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECAudioSystem.cpp;h=6d1d94827a50972c02f1c45c380952d6ab099dea;hb=9fc1bdd32ebb03b2854533dec43eb947299c674c;hp=87735f4a5ed7aa8c6e83f1e6231946c57dc63e21;hpb=9f332fe262328ff230ae4ea69004f8f2e9f61e6f;p=deb_libcec.git

diff --git a/src/lib/devices/CECAudioSystem.cpp b/src/lib/devices/CECAudioSystem.cpp
index 87735f4..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.
@@ -33,8 +33,12 @@
 #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),
@@ -46,12 +50,10 @@ CCECAudioSystem::CCECAudioSystem(CCECProcessor *processor, cec_logical_address a
 
 bool CCECAudioSystem::SetAudioStatus(uint8_t status)
 {
+  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());
-
+    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;
   }
@@ -59,14 +61,12 @@ bool CCECAudioSystem::SetAudioStatus(uint8_t status)
   return false;
 }
 
-bool CCECAudioSystem::SetSystemAudioMode(const cec_system_audio_status mode)
+bool CCECAudioSystem::SetSystemAudioModeStatus(const cec_system_audio_status mode)
 {
+  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());
-
+    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;
   }
@@ -74,77 +74,65 @@ bool CCECAudioSystem::SetSystemAudioMode(const cec_system_audio_status mode)
   return false;
 }
 
-bool CCECAudioSystem::SetSystemAudioMode(const cec_command &command)
+bool CCECAudioSystem::TransmitAudioStatus(cec_logical_address dest)
 {
-  SetSystemAudioMode((command.parameters.size == 0) ?
-    CEC_SYSTEM_AUDIO_STATUS_OFF :
-  CEC_SYSTEM_AUDIO_STATUS_ON);
+  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 TransmitAudioStatus(command.initiator);
+  return m_handler->TransmitAudioStatus(m_iLogicalAddress, dest, state);
 }
 
-bool CCECAudioSystem::TransmitAudioStatus(cec_logical_address dest)
+bool CCECAudioSystem::TransmitSetSystemAudioMode(cec_logical_address dest)
 {
-  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);
+    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 '%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);
+    CLibCEC::AddLog(CEC_LOG_NOTICE, "<< %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);
 }
 
-uint8_t CCECAudioSystem::VolumeUp(bool bWait /* = true */)
+uint8_t CCECAudioSystem::VolumeUp(bool bSendRelease /* = true */)
 {
-  return SendKey(CEC_USER_CONTROL_CODE_VOLUME_UP, bWait);
-}
+  if (TransmitKeypress(CEC_USER_CONTROL_CODE_VOLUME_UP) && bSendRelease)
+    TransmitKeyRelease();
 
-uint8_t CCECAudioSystem::VolumeDown(bool bWait /* = true */)
-{
-  return SendKey(CEC_USER_CONTROL_CODE_VOLUME_DOWN, bWait);
+  CLockObject lock(m_mutex);
+  return m_audioStatus;
 }
 
-uint8_t CCECAudioSystem::MuteAudio(bool bWait /* = true */)
+uint8_t CCECAudioSystem::VolumeDown(bool bSendRelease /* = true */)
 {
-  return SendKey(CEC_USER_CONTROL_CODE_MUTE, bWait);
+  if (TransmitKeypress(CEC_USER_CONTROL_CODE_VOLUME_DOWN) && bSendRelease)
+    TransmitKeyRelease();
+
+  CLockObject lock(m_mutex);
+  return m_audioStatus;
 }
 
-uint8_t CCECAudioSystem::SendKey(cec_user_control_code key, bool bWait /* = true */)
+uint8_t CCECAudioSystem::MuteAudio(bool bSendRelease /* = true */)
 {
-  {
-    CLockObject lock(&m_transmitMutex);
-    cec_command command;
-    cec_command::Format(command, m_processor->GetLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_USER_CONTROL_PRESSED);
-    command.parameters.PushBack(key);
-    m_processor->Transmit(command);
-
-    cec_command::Format(command, m_processor->GetLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_USER_CONTROL_RELEASE);
-    if (bWait)
-    {
-      if (m_processor->Transmit(command))
-        m_condition.Wait(&m_transmitMutex, 1000);
-    }
-    else
-    {
-      m_processor->Transmit(command);
-    }
-  }
+  if (TransmitKeypress(CEC_USER_CONTROL_CODE_MUTE) && bSendRelease)
+    TransmitKeyRelease();
 
-  CLockObject lock(&m_mutex);
+  CLockObject lock(m_mutex);
   return m_audioStatus;
 }