win32: fix accidental rename and compiler warnings

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

diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h
index 052dc993834a62d1b656ba30d33d4ec75580efd6..b725119ce4c707cddf07965193caa17eb7d70292 100644 (file)
--- a/src/lib/CECProcessor.h
+++ b/src/lib/CECProcessor.h
@@ -86,12 +86,14 @@ namespace CEC
       virtual bool SetStreamPath(uint16_t iStreamPath);
       virtual bool SwitchMonitoring(bool bEnable);
       virtual bool PollDevice(cec_logical_address iAddress);
-      virtual uint8_t VolumeUp(bool bWait = true);
-      virtual uint8_t VolumeDown(bool bWait = true);
-      virtual uint8_t MuteAudio(bool bWait = true);
-      virtual bool SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = false);
-      virtual bool SendKeyRelease(cec_logical_address iDestination, bool bWait = false);
+      virtual uint8_t VolumeUp(void);
+      virtual uint8_t VolumeDown(void);
+      virtual uint8_t MuteAudio(void);
+      virtual bool TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key);
+      virtual bool TransmitKeyRelease(cec_logical_address iDestination);
       virtual bool EnablePhysicalAddressDetection(void) { return false; };
+      void SetStandardLineTimeout(uint8_t iTimeout);
+      void SetRetryLineTimeout(uint8_t iTimeout);
 
       bool SetLineTimeout(uint8_t iTimeout);
 
@@ -123,6 +125,7 @@ namespace CEC
       virtual bool PingAdapter(void);
 
       CCECBusDevice *m_busDevices[16];
+      CMutex         m_transmitMutex;
 
   private:
       void ScanCECBus(void);
@@ -155,6 +158,8 @@ namespace CEC
       cec_keypress           m_previousKey;
       CThread *              m_busScan;
       uint8_t                m_iLineTimeout;
+      uint8_t                m_iStandardLineTimeout;
+      uint8_t                m_iRetryLineTimeout;
   };
 
   class CCECBusScan : public CThread