X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.h;h=d227c0312749611f7bc753a51abab5de3542a1df;hb=2ee922ad2f1812c74f2aa6e61305fdcc5c27de53;hp=89fb690088dea9054599fba9c2837485b29fc100;hpb=04283ce44fc45cbfb145075d02ff116e277f7560;p=deb_libcec.git diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h index 89fb690..d227c03 100644 --- a/src/lib/devices/CECBusDevice.h +++ b/src/lib/devices/CECBusDevice.h @@ -2,7 +2,7 @@ /* * This file is part of the libCEC(R) library. * - * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved. + * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. * libCEC(R) is an original work, containing original code. * * libCEC(R) is a trademark of Pulse-Eight Limited. @@ -31,11 +31,10 @@ * http://www.pulse-eight.net/ */ -#include "../../../include/cectypes.h" #include #include -#include "../platform/threads/mutex.h" -#include "../platform/util/StdString.h" +#include "lib/platform/threads/mutex.h" +#include "lib/platform/util/StdString.h" namespace CEC { @@ -51,22 +50,11 @@ namespace CEC class CResponse { public: - CResponse(cec_opcode opcode) : - m_opcode(opcode){} - ~CResponse(void) - { - Broadcast(); - } - - bool Wait(uint32_t iTimeout) - { - return m_event.Wait(iTimeout); - } - - void Broadcast(void) - { - m_event.Broadcast(); - } + CResponse(cec_opcode opcode); + ~CResponse(void); + + bool Wait(uint32_t iTimeout); + void Broadcast(void); private: cec_opcode m_opcode; @@ -76,52 +64,15 @@ namespace CEC class CWaitForResponse { public: - CWaitForResponse(void) {} - ~CWaitForResponse(void) - { - Clear(); - } - - void Clear() - { - PLATFORM::CLockObject lock(m_mutex); - for (std::map::iterator it = m_waitingFor.begin(); it != m_waitingFor.end(); it++) - it->second->Broadcast(); - m_waitingFor.clear(); - } - - bool Wait(cec_opcode opcode, uint32_t iTimeout = CEC_DEFAULT_TRANSMIT_WAIT) - { - CResponse *response = GetEvent(opcode); - return response ? response->Wait(iTimeout) : false; - } - - void Received(cec_opcode opcode) - { - CResponse *response = GetEvent(opcode); - if (response) - response->Broadcast(); - } + CWaitForResponse(void); + ~CWaitForResponse(void); + + void Clear(); + bool Wait(cec_opcode opcode, uint32_t iTimeout = CEC_DEFAULT_TRANSMIT_WAIT); + void Received(cec_opcode opcode); private: - CResponse *GetEvent(cec_opcode opcode) - { - CResponse *retVal(NULL); - { - PLATFORM::CLockObject lock(m_mutex); - std::map::iterator it = m_waitingFor.find(opcode); - if (it != m_waitingFor.end()) - { - retVal = it->second; - } - else - { - retVal = new CResponse(opcode); - m_waitingFor[opcode] = retVal; - } - return retVal; - } - } + CResponse *GetEvent(cec_opcode opcode); PLATFORM::CMutex m_mutex; std::map m_waitingFor; @@ -167,70 +118,73 @@ namespace CEC virtual cec_version GetCecVersion(const cec_logical_address initiator, bool bUpdate = false); virtual void SetCecVersion(const cec_version newVersion); virtual bool RequestCecVersion(const cec_logical_address initiator, bool bWaitForResponse = true); - virtual bool TransmitCECVersion(const cec_logical_address destination); + virtual bool TransmitCECVersion(const cec_logical_address destination, bool bIsReply); virtual cec_menu_language & GetMenuLanguage(const cec_logical_address initiator, bool bUpdate = false); virtual void SetMenuLanguage(const char *strLanguage); virtual void SetMenuLanguage(const cec_menu_language &menuLanguage); virtual bool RequestMenuLanguage(const cec_logical_address initiator, bool bWaitForResponse = true); - virtual bool TransmitSetMenuLanguage(const cec_logical_address destination); + virtual bool TransmitSetMenuLanguage(const cec_logical_address destination, bool bIsReply); - virtual bool TransmitOSDString(const cec_logical_address destination, cec_display_control duration, const char *strMessage); + virtual bool TransmitOSDString(const cec_logical_address destination, cec_display_control duration, const char *strMessage, bool bIsReply); virtual CStdString GetCurrentOSDName(void); virtual CStdString GetOSDName(const cec_logical_address initiator, bool bUpdate = false); virtual void SetOSDName(CStdString strName); virtual bool RequestOSDName(const cec_logical_address source, bool bWaitForResponse = true); - virtual bool TransmitOSDName(const cec_logical_address destination); + virtual bool TransmitOSDName(const cec_logical_address destination, bool bIsReply); virtual uint16_t GetCurrentPhysicalAddress(void); virtual bool HasValidPhysicalAddress(void); virtual uint16_t GetPhysicalAddress(const cec_logical_address initiator, bool bSuppressUpdate = false); virtual bool SetPhysicalAddress(uint16_t iNewAddress); virtual bool RequestPhysicalAddress(const cec_logical_address initiator, bool bWaitForResponse = true); - virtual bool TransmitPhysicalAddress(void); + virtual bool TransmitPhysicalAddress(bool bIsReply); virtual cec_power_status GetCurrentPowerStatus(void); virtual cec_power_status GetPowerStatus(const cec_logical_address initiator, bool bUpdate = false); virtual void SetPowerStatus(const cec_power_status powerStatus); - virtual bool RequestPowerStatus(const cec_logical_address initiator, bool bWaitForResponse = true); - virtual bool TransmitPowerState(const cec_logical_address destination); + virtual void OnImageViewOnSent(bool bSentByLibCEC); + virtual bool ImageViewOnSent(void); + virtual bool RequestPowerStatus(const cec_logical_address initiator, bool bUpdate, bool bWaitForResponse = true); + virtual bool TransmitPowerState(const cec_logical_address destination, bool bIsReply); virtual cec_vendor_id GetCurrentVendorId(void); virtual cec_vendor_id GetVendorId(const cec_logical_address initiator, bool bUpdate = false); virtual const char * GetVendorName(const cec_logical_address initiator, bool bUpdate = false); virtual bool SetVendorId(uint64_t iVendorId); virtual bool RequestVendorId(const cec_logical_address initiator, bool bWaitForResponse = true); - virtual bool TransmitVendorID(const cec_logical_address destination, bool bSendAbort = true); + virtual bool TransmitVendorID(const cec_logical_address destination, bool bSendAbort, bool bIsReply); virtual cec_bus_device_status GetCurrentStatus(void) { return GetStatus(false, true); } virtual cec_bus_device_status GetStatus(bool bForcePoll = false, bool bSuppressPoll = false); - virtual void SetDeviceStatus(const cec_bus_device_status newStatus); - virtual void ResetDeviceStatus(void); - virtual bool TransmitPoll(const cec_logical_address destination); + virtual void SetDeviceStatus(const cec_bus_device_status newStatus, cec_version libCECSpecVersion = CEC_VERSION_1_4); + virtual void ResetDeviceStatus(bool bClientUnregistered = false); + virtual bool TransmitPoll(const cec_logical_address destination, bool bUpdateDeviceStatus); virtual void HandlePoll(const cec_logical_address destination); virtual void HandlePollFrom(const cec_logical_address initiator); virtual bool HandleReceiveFailed(void); virtual cec_menu_state GetMenuState(const cec_logical_address initiator); virtual void SetMenuState(const cec_menu_state state); - virtual bool TransmitMenuState(const cec_logical_address destination); + virtual bool TransmitMenuState(const cec_logical_address destination, bool bIsReply); virtual bool ActivateSource(uint64_t iDelay = 0); virtual bool IsActiveSource(void) const { return m_bActiveSource; } virtual bool RequestActiveSource(bool bWaitForResponse = true); virtual void MarkAsActiveSource(void); - virtual void MarkAsInactiveSource(void); - virtual bool TransmitActiveSource(void); + virtual void MarkAsInactiveSource(bool bClientUnregistered = false); + virtual bool TransmitActiveSource(bool bIsReply); virtual bool TransmitImageViewOn(void); virtual bool TransmitInactiveSource(void); virtual bool TransmitPendingActiveSourceCommands(void); + virtual void SetActiveRoute(uint16_t iRoute); virtual void SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress = CEC_INVALID_PHYSICAL_ADDRESS); virtual bool PowerOn(const cec_logical_address initiator); virtual bool Standby(const cec_logical_address initiator); - virtual bool TryLogicalAddress(void); + virtual bool TryLogicalAddress(cec_version libCECSpecVersion = CEC_VERSION_1_4); CCECClient * GetClient(void); void SignalOpcode(cec_opcode opcode); @@ -267,8 +221,8 @@ namespace CEC bool m_bReplaceHandler; cec_menu_state m_menuState; bool m_bActiveSource; - uint64_t m_iLastActive; - uint64_t m_iLastPowerStateUpdate; + int64_t m_iLastActive; + int64_t m_iLastPowerStateUpdate; cec_version m_cecVersion; cec_bus_device_status m_deviceStatus; std::set m_unsupportedFeatures; @@ -279,5 +233,6 @@ namespace CEC bool m_bAwaitingReceiveFailed; bool m_bVendorIdRequested; CWaitForResponse *m_waitForResponse; + bool m_bImageViewOnSent; }; };