cec: refactor CEC read/write. keep a single lock for all writes, not one per device

[deb_libcec.git] / src / lib / devices / CECBusDevice.h

diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h
index eb48b343cea0b96c97141e4fce809bd3e3ee9b3a..98e9431aa8adee0487feb120708cd03da0233f50 100644 (file)
--- a/src/lib/devices/CECBusDevice.h
+++ b/src/lib/devices/CECBusDevice.h
@@ -69,7 +69,6 @@ namespace CEC
     virtual cec_device_type       GetType(void) const { return m_type; }
     virtual cec_vendor_id         GetVendorId(void);
     virtual const char *          GetVendorName(void);
-    virtual int32_t               GetTransmitTimeout(void) const { return m_iTransmitTimeout; }
     virtual bool                  MyLogicalAddressContains(cec_logical_address address) const;
     virtual cec_bus_device_status GetStatus(bool bForcePoll = false);
 
@@ -91,9 +90,8 @@ namespace CEC
     virtual void SetMenuLanguage(const cec_menu_language &menuLanguage);
     virtual void SetOSDName(CStdString strName);
     virtual void SetMenuState(const cec_menu_state state);
-    virtual void SetVendorId(uint64_t iVendorId, bool bInitHandler = true);
+    virtual bool SetVendorId(uint64_t iVendorId, bool bInitHandler = true);
     virtual void SetPowerStatus(const cec_power_status powerStatus);
-    virtual void SetTransmitTimeout(uint32_t iTimeout) { m_iTransmitTimeout = iTimeout; }
 
     virtual bool TransmitActiveSource(void);
     virtual bool TransmitCECVersion(cec_logical_address dest);
@@ -105,8 +103,8 @@ namespace CEC
     virtual bool TransmitPowerState(cec_logical_address dest);
     virtual bool TransmitPoll(cec_logical_address dest);
     virtual bool TransmitVendorID(cec_logical_address dest);
-    virtual bool SendKeypress(cec_user_control_code key, bool bWait = true);
-    virtual bool SendKeyRelease(bool bWait = true);
+    virtual bool SendKeypress(cec_user_control_code key);
+    virtual bool SendKeyRelease(void);
 
   protected:
     bool NeedsPoll(void);
@@ -127,10 +125,7 @@ namespace CEC
     uint64_t              m_iLastActive;
     cec_version           m_cecVersion;
     cec_bus_device_status m_deviceStatus;
-    int32_t               m_iTransmitTimeout;
-    CMutex                m_transmitMutex;
     CMutex                m_writeMutex;
     CMutex                m_mutex;
-    CCondition            m_condition;
   };
 };