cec: couple of cleanups. don't refresh the vendorid when not needed. refresh the...

[deb_libcec.git] / src / lib / CECProcessor.cpp

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 11065ebfec6e5b6bb7198986825db3f93d8c9bd9..af45f9a653b04843f8f8c284b8e782527a186f49 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -55,7 +55,9 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, cec
     m_strDeviceName(strDeviceName),
     m_controller(controller),
     m_bMonitor(false),
-    m_busScan(NULL)
+    m_busScan(NULL),
+    m_iStandardLineTimeout(3),
+    m_iRetryLineTimeout(3)
 {
   m_communication = new CAdapterCommunication(this);
   m_logicalAddresses.Clear();
@@ -72,7 +74,9 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con
     m_strDeviceName(strDeviceName),
     m_types(types),
     m_controller(controller),
-    m_bMonitor(false)
+    m_bMonitor(false),
+    m_iStandardLineTimeout(3),
+    m_iRetryLineTimeout(3)
 {
   m_communication = new CAdapterCommunication(this);
   m_logicalAddresses.Clear();
@@ -333,6 +337,18 @@ bool CCECProcessor::SetActiveSource(cec_device_type type /* = CEC_DEVICE_TYPE_RE
   return bReturn;
 }
 
+void CCECProcessor::SetStandardLineTimeout(uint8_t iTimeout)
+{
+  CLockObject lock(&m_mutex);
+  m_iStandardLineTimeout = iTimeout;
+}
+
+void CCECProcessor::SetRetryLineTimeout(uint8_t iTimeout)
+{
+  CLockObject lock(&m_mutex);
+  m_iRetryLineTimeout = iTimeout;
+}
+
 bool CCECProcessor::SetActiveSource(cec_logical_address iAddress)
 {
   return SetStreamPath(m_busDevices[iAddress]->GetPhysicalAddress(false));
@@ -556,29 +572,29 @@ bool CCECProcessor::PollDevice(cec_logical_address iAddress)
   return false;
 }
 
-uint8_t CCECProcessor::VolumeUp(bool bWait /* = true */)
+uint8_t CCECProcessor::VolumeUp(void)
 {
   uint8_t status = 0;
   if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM))
-    status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeUp(bWait);
+    status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeUp();
 
   return status;
 }
 
-uint8_t CCECProcessor::VolumeDown(bool bWait /* = true */)
+uint8_t CCECProcessor::VolumeDown(void)
 {
   uint8_t status = 0;
   if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM))
-    status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeDown(bWait);
+    status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->VolumeDown();
 
   return status;
 }
 
-uint8_t CCECProcessor::MuteAudio(bool bWait /* = true */)
+uint8_t CCECProcessor::MuteAudio(void)
 {
   uint8_t status = 0;
   if (IsActiveDevice(CECDEVICE_AUDIOSYSTEM))
-    status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio(bWait);
+    status = ((CCECAudioSystem *)m_busDevices[CECDEVICE_AUDIOSYSTEM])->MuteAudio();
 
   return status;
 }
@@ -674,12 +690,12 @@ bool CCECProcessor::Transmit(CCECAdapterMessage *output)
   bool bReturn(false);
   CLockObject lock(&m_mutex);
   {
-    m_communication->SetLineTimeout(3);
+    m_communication->SetLineTimeout(m_iStandardLineTimeout);
 
     do
     {
       if (output->tries > 0)
-        m_communication->SetLineTimeout(5);
+        m_communication->SetLineTimeout(m_iRetryLineTimeout);
 
       CLockObject msgLock(&output->mutex);
       if (!m_communication || !m_communication->Write(output))
@@ -704,7 +720,7 @@ bool CCECProcessor::Transmit(CCECAdapterMessage *output)
     }while (output->transmit_timeout > 0 && output->needs_retry() && ++output->tries <= output->maxTries);
   }
 
-  m_communication->SetLineTimeout(3);
+  m_communication->SetLineTimeout(m_iStandardLineTimeout);
 
   return bReturn;
 }
@@ -936,14 +952,14 @@ bool CCECProcessor::SetAckMask(uint16_t iMask)
   return bReturn;
 }
 
-bool CCECProcessor::SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait /* = false */)
+bool CCECProcessor::TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key)
 {
-  return m_busDevices[iDestination]->SendKeypress(key, bWait);
+  return m_busDevices[iDestination]->TransmitKeypress(key);
 }
 
-bool CCECProcessor::SendKeyRelease(cec_logical_address iDestination, bool bWait /* = false */)
+bool CCECProcessor::TransmitKeyRelease(cec_logical_address iDestination)
 {
-  return m_busDevices[iDestination]->SendKeyRelease(bWait);
+  return m_busDevices[iDestination]->TransmitKeyRelease();
 }
 
 const char *CCECProcessor::ToString(const cec_menu_state state)
@@ -1281,8 +1297,15 @@ void *CCECBusScan::Process(void)
         if (device && device->GetStatus(true) == CEC_DEVICE_STATUS_PRESENT)
         {
           if (!IsStopped())
+          {
             device->GetVendorId();
-          Sleep(5);
+            Sleep(5);
+          }
+          if (!IsStopped())
+          {
+            device->GetPowerStatus(true);
+            Sleep(5);
+          }
         }
       }
     }