cec: refactored threading/locking - added windows native instead of pthread-win32...

[deb_libcec.git] / src / lib / devices / CECAudioSystem.cpp

diff --git a/src/lib/devices/CECAudioSystem.cpp b/src/lib/devices/CECAudioSystem.cpp
index 38bdb47cbea23becd2f89ab61ec0d7748baa4200..7bdb0912de46d6b2b80431535f0daa1badc6cc93 100644 (file)
--- a/src/lib/devices/CECAudioSystem.cpp
+++ b/src/lib/devices/CECAudioSystem.cpp
@@ -35,6 +35,7 @@
 #include "../implementations/CECCommandHandler.h"
 
 using namespace CEC;
+using namespace PLATFORM;
 
 #define ToString(p) m_processor->ToString(p)
 
@@ -48,7 +49,7 @@ CCECAudioSystem::CCECAudioSystem(CCECProcessor *processor, cec_logical_address a
 
 bool CCECAudioSystem::SetAudioStatus(uint8_t status)
 {
-  CLockObject lock(&m_writeMutex);
+  CLockObject lock(m_mutex);
   if (m_audioStatus != status)
   {
     CStdString strLog;
@@ -64,7 +65,7 @@ bool CCECAudioSystem::SetAudioStatus(uint8_t status)
 
 bool CCECAudioSystem::SetSystemAudioModeStatus(const cec_system_audio_status mode)
 {
-  CLockObject lock(&m_writeMutex);
+  CLockObject lock(m_mutex);
   if (m_systemAudioStatus != mode)
   {
     CStdString strLog;
@@ -82,7 +83,7 @@ bool CCECAudioSystem::TransmitAudioStatus(cec_logical_address dest)
 {
   uint8_t state;
   {
-    CLockObject lock(&m_writeMutex);
+    CLockObject lock(m_mutex);
     CStdString strLog;
     strLog.Format("<< %x -> %x: audio status '%2x'", m_iLogicalAddress, dest, m_audioStatus);
     AddLog(CEC_LOG_NOTICE, strLog);
@@ -96,7 +97,7 @@ bool CCECAudioSystem::TransmitSetSystemAudioMode(cec_logical_address dest)
 {
   cec_system_audio_status state;
   {
-    CLockObject lock(&m_writeMutex);
+    CLockObject lock(m_mutex);
     CStdString strLog;
     strLog.Format("<< %x -> %x: set system audio mode '%2x'", m_iLogicalAddress, dest, m_audioStatus);
     AddLog(CEC_LOG_NOTICE, strLog);
@@ -110,7 +111,7 @@ bool CCECAudioSystem::TransmitSystemAudioModeStatus(cec_logical_address dest)
 {
   cec_system_audio_status state;
   {
-    CLockObject lock(&m_writeMutex);
+    CLockObject lock(m_mutex);
     CStdString strLog;
     strLog.Format("<< %x -> %x: system audio mode '%s'", m_iLogicalAddress, dest, ToString(m_systemAudioStatus));
     AddLog(CEC_LOG_NOTICE, strLog);
@@ -120,29 +121,29 @@ bool CCECAudioSystem::TransmitSystemAudioModeStatus(cec_logical_address dest)
   return m_handler->TransmitSystemAudioModeStatus(m_iLogicalAddress, dest, state);
 }
 
-uint8_t CCECAudioSystem::VolumeUp(void)
+uint8_t CCECAudioSystem::VolumeUp(bool bSendRelease /* = true */)
 {
-  if (SendKeypress(CEC_USER_CONTROL_CODE_VOLUME_UP))
-    SendKeyRelease();
+  if (TransmitKeypress(CEC_USER_CONTROL_CODE_VOLUME_UP) && bSendRelease)
+    TransmitKeyRelease();
 
-  CLockObject lock(&m_mutex);
+  CLockObject lock(m_mutex);
   return m_audioStatus;
 }
 
-uint8_t CCECAudioSystem::VolumeDown(void)
+uint8_t CCECAudioSystem::VolumeDown(bool bSendRelease /* = true */)
 {
-  if (SendKeypress(CEC_USER_CONTROL_CODE_VOLUME_DOWN))
-    SendKeyRelease();
+  if (TransmitKeypress(CEC_USER_CONTROL_CODE_VOLUME_DOWN) && bSendRelease)
+    TransmitKeyRelease();
 
-  CLockObject lock(&m_mutex);
+  CLockObject lock(m_mutex);
   return m_audioStatus;
 }
 
-uint8_t CCECAudioSystem::MuteAudio(void)
+uint8_t CCECAudioSystem::MuteAudio(bool bSendRelease /* = true */)
 {
-  if (SendKeypress(CEC_USER_CONTROL_CODE_MUTE))
-    SendKeyRelease();
+  if (TransmitKeypress(CEC_USER_CONTROL_CODE_MUTE) && bSendRelease)
+    TransmitKeyRelease();
 
-  CLockObject lock(&m_mutex);
+  CLockObject lock(m_mutex);
   return m_audioStatus;
 }