X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdevices%2FCECBusDevice.h;h=30d8329c5c8d711f8f4335b9d86f6019d9e9f9c8;hb=fe0cd8aa72091d860ad374abcbc0d8217f25ba69;hp=23b6c15cd5ec0d8cc51946b205be920140dda12c;hpb=4bec9d79a5b66d6fe14b19c4e66509b03cc53e90;p=deb_libcec.git diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h index 23b6c15..30d8329 100644 --- a/src/lib/devices/CECBusDevice.h +++ b/src/lib/devices/CECBusDevice.h @@ -32,6 +32,7 @@ */ #include +#include #include "../platform/threads.h" #include "../util/StdString.h" @@ -73,11 +74,13 @@ namespace CEC virtual bool MyLogicalAddressContains(cec_logical_address address) const; virtual cec_bus_device_status GetStatus(bool bForcePoll = false); virtual bool IsActiveSource(void) const { return m_bActiveSource; } - + virtual bool IsUnsupportedFeature(cec_opcode opcode) const; + virtual void SetUnsupportedFeature(cec_opcode opcode); virtual void SetInactiveSource(void); virtual void SetActiveSource(void); virtual bool TryLogicalAddress(void); + virtual bool InitHandler(void); virtual void SetDeviceStatus(const cec_bus_device_status newStatus); virtual void SetPhysicalAddress(uint16_t iNewAddress); @@ -103,6 +106,8 @@ namespace CEC virtual bool TransmitKeyRelease(bool bWait = true); protected: + bool ReplaceHandler(bool bInitHandler = true); + bool RequestCecVersion(void); bool RequestMenuLanguage(void); bool RequestPowerStatus(void); @@ -122,12 +127,14 @@ namespace CEC CCECProcessor * m_processor; CCECCommandHandler * m_handler; cec_vendor_id m_vendor; + bool m_bReplaceHandler; cec_menu_state m_menuState; bool m_bActiveSource; uint64_t m_iLastActive; cec_version m_cecVersion; cec_bus_device_status m_deviceStatus; - CMutex m_writeMutex; + std::set m_unsupportedFeatures; CMutex m_mutex; + CMutex m_handlerMutex; }; };