X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECBusDevice.h;h=30ac2dc788df51c50251eaae0c8a4488799ccc03;hb=e69d8f191784c77c156ffec90db50767f91421e3;hp=509e57c604dc5d6d90ed0835e281e2bd2c56af54;hpb=a1f8fb1b065d260eb9d6eaf7e053f7415b453613;p=deb_libcec.git diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h index 509e57c..30ac2dc 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 Pulse-Eight Limited. All rights reserved. + * libCEC(R) is Copyright (C) 2011-2012 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,9 +31,10 @@ * http://www.pulse-eight.net/ */ -#include -#include "../platform/threads.h" -#include "../util/StdString.h" +#include "../../../include/cectypes.h" +#include +#include "../platform/threads/mutex.h" +#include "../platform/util/StdString.h" namespace CEC { @@ -48,64 +49,102 @@ namespace CEC CCECBusDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress = 0); virtual ~CCECBusDevice(void); - virtual void AddLog(cec_log_level level, const CStdString &strMessage); virtual bool HandleCommand(const cec_command &command); - virtual void PollVendorId(void); virtual bool PowerOn(void); virtual bool Standby(void); - virtual cec_version GetCecVersion(void); - virtual CCECCommandHandler *GetHandler(void) const { return m_handler; }; - virtual uint64_t GetLastActive(void) const { return m_iLastActive; } - virtual cec_logical_address GetLogicalAddress(void) const { return m_iLogicalAddress; } - virtual cec_menu_language & GetMenuLanguage(void); - virtual cec_logical_address GetMyLogicalAddress(void) const; - virtual uint16_t GetMyPhysicalAddress(void) const; - virtual uint16_t GetPhysicalAddress(void) const { return m_iPhysicalAddress; } - virtual cec_power_status GetPowerStatus(void); - virtual CCECProcessor * GetProcessor(void) const { return m_processor; } - virtual cec_device_type GetType(void) const { return m_type; } - virtual const cec_vendor & GetVendor(void); - virtual uint8_t GetVendorClass(void) const { return m_iVendorClass; } - virtual cec_vendor_id GetVendorId(void) { return GetVendor().vendor; }; - virtual const char * GetVendorName(void) { return GetVendor().AsString(); } - virtual bool MyLogicalAddressContains(cec_logical_address address) const; + virtual cec_version GetCecVersion(bool bUpdate = false); + virtual CCECCommandHandler * GetHandler(void) const { return m_handler; }; + virtual uint64_t GetLastActive(void) const { return m_iLastActive; } + virtual cec_logical_address GetLogicalAddress(void) const { return m_iLogicalAddress; } + virtual const char* GetLogicalAddressName(void) const; + virtual cec_menu_language & GetMenuLanguage(bool bUpdate = false); + virtual cec_menu_state GetMenuState(void); + virtual cec_logical_address GetMyLogicalAddress(void) const; + virtual uint16_t GetMyPhysicalAddress(void) const; + virtual CStdString GetOSDName(bool bUpdate = false); + virtual uint16_t GetPhysicalAddress(bool bUpdate = false); + virtual cec_power_status GetPowerStatus(bool bUpdate = false); + virtual CCECProcessor * GetProcessor(void) const { return m_processor; } + virtual cec_device_type GetType(void) const { return m_type; } + virtual cec_vendor_id GetVendorId(bool bUpdate = false); + virtual const char * GetVendorName(bool bUpdate = false); + 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 HandlePoll(cec_logical_address initiator); + virtual bool HandleReceiveFailed(void); - virtual void SetPhysicalAddress(uint16_t iNewAddress, uint16_t iOldAddress = 0); + virtual void SetInactiveSource(void); + virtual void SetActiveSource(void); + virtual bool TryLogicalAddress(void); + virtual bool ActivateSource(void); + + virtual void SetDeviceStatus(const cec_bus_device_status newStatus); + virtual void SetPhysicalAddress(uint16_t iNewAddress); + virtual void SetStreamPath(uint16_t iNewAddress, uint16_t iOldAddress = 0); virtual void SetCecVersion(const cec_version newVersion); virtual void SetMenuLanguage(const cec_menu_language &menuLanguage); - virtual void SetVendorId(const cec_datapacket &data); - virtual void SetVendorId(uint64_t iVendorId, uint8_t iVendorClass = 0); + virtual void SetOSDName(CStdString strName); + virtual void SetMenuState(const cec_menu_state state); + virtual bool SetVendorId(uint64_t iVendorId); virtual void SetPowerStatus(const cec_power_status powerStatus); virtual bool TransmitActiveSource(void); - virtual bool TransmitActiveView(void); virtual bool TransmitCECVersion(cec_logical_address dest); - virtual bool TransmitDeckStatus(cec_logical_address dest); - virtual bool TransmitInactiveView(void); + virtual bool TransmitImageViewOn(void); + virtual bool TransmitInactiveSource(void); virtual bool TransmitMenuState(cec_logical_address dest); virtual bool TransmitOSDName(cec_logical_address dest); virtual bool TransmitOSDString(cec_logical_address dest, cec_display_control duration, const char *strMessage); virtual bool TransmitPhysicalAddress(void); virtual bool TransmitPowerState(cec_logical_address dest); virtual bool TransmitPoll(cec_logical_address dest); - virtual bool TransmitVendorID(cec_logical_address dest); + virtual bool TransmitVendorID(cec_logical_address dest, bool bSendAbort = true); + virtual bool TransmitKeypress(cec_user_control_code key, bool bWait = true); + virtual bool TransmitKeyRelease(bool bWait = true); + + bool ReplaceHandler(bool bActivateSource = true); protected: - cec_device_type m_type; - CStdString m_strDeviceName; - uint16_t m_iPhysicalAddress; - cec_logical_address m_iLogicalAddress; - cec_power_status m_powerStatus; - cec_menu_language m_menuLanguage; - CCECProcessor *m_processor; - CCECCommandHandler *m_handler; - cec_vendor m_vendor; - bool m_bMenuActive; - uint8_t m_iVendorClass; - uint64_t m_iLastActive; - cec_version m_cecVersion; - CMutex m_mutex; - CCondition m_condition; + void CheckVendorIdRequested(void); + void MarkBusy(void); + void MarkReady(void); + + bool RequestCecVersion(void); + bool RequestMenuLanguage(void); + bool RequestPowerStatus(void); + bool RequestVendorId(void); + bool RequestPhysicalAddress(void); + bool RequestOSDName(void); + + bool NeedsPoll(void); + + cec_device_type m_type; + CStdString m_strDeviceName; + uint16_t m_iPhysicalAddress; + uint16_t m_iStreamPath; + cec_logical_address m_iLogicalAddress; + cec_power_status m_powerStatus; + cec_menu_language m_menuLanguage; + 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; + uint64_t m_iLastPowerStateUpdate; + cec_version m_cecVersion; + cec_bus_device_status m_deviceStatus; + std::set m_unsupportedFeatures; + PLATFORM::CMutex m_mutex; + PLATFORM::CMutex m_handlerMutex; + PLATFORM::CEvent m_replacing; + unsigned m_iHandlerUseCount; + bool m_bAwaitingReceiveFailed; + bool m_bVendorIdRequested; }; };