cec: added bWait parameter to volume change methods.

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

diff --git a/src/lib/devices/CECAudioSystem.cpp b/src/lib/devices/CECAudioSystem.cpp
index 4a4f11fbe2434a898df529176772f57749f5c0f3..87735f4a5ed7aa8c6e83f1e6231946c57dc63e21 100644 (file)
--- a/src/lib/devices/CECAudioSystem.cpp
+++ b/src/lib/devices/CECAudioSystem.cpp
@@ -109,22 +109,22 @@ bool CCECAudioSystem::TransmitSystemAudioModeStatus(cec_logical_address dest)
   return m_processor->Transmit(command);
 }
 
-uint8_t CCECAudioSystem::VolumeUp(void)
+uint8_t CCECAudioSystem::VolumeUp(bool bWait /* = true */)
 {
-  return SendKey(CEC_USER_CONTROL_CODE_VOLUME_UP);
+  return SendKey(CEC_USER_CONTROL_CODE_VOLUME_UP, bWait);
 }
 
-uint8_t CCECAudioSystem::VolumeDown(void)
+uint8_t CCECAudioSystem::VolumeDown(bool bWait /* = true */)
 {
-  return SendKey(CEC_USER_CONTROL_CODE_VOLUME_DOWN);
+  return SendKey(CEC_USER_CONTROL_CODE_VOLUME_DOWN, bWait);
 }
 
-uint8_t CCECAudioSystem::MuteAudio(void)
+uint8_t CCECAudioSystem::MuteAudio(bool bWait /* = true */)
 {
-  return SendKey(CEC_USER_CONTROL_CODE_MUTE);
+  return SendKey(CEC_USER_CONTROL_CODE_MUTE, bWait);
 }
 
-uint8_t CCECAudioSystem::SendKey(cec_user_control_code key)
+uint8_t CCECAudioSystem::SendKey(cec_user_control_code key, bool bWait /* = true */)
 {
   {
     CLockObject lock(&m_transmitMutex);
@@ -134,8 +134,15 @@ uint8_t CCECAudioSystem::SendKey(cec_user_control_code key)
     m_processor->Transmit(command);
 
     cec_command::Format(command, m_processor->GetLogicalAddress(), m_iLogicalAddress, CEC_OPCODE_USER_CONTROL_RELEASE);
-    if (m_processor->Transmit(command))
-      m_condition.Wait(&m_transmitMutex, 1000);
+    if (bWait)
+    {
+      if (m_processor->Transmit(command))
+        m_condition.Wait(&m_transmitMutex, 1000);
+    }
+    else
+    {
+      m_processor->Transmit(command);
+    }
   }
 
   CLockObject lock(&m_mutex);