X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fimplementations%2FCECCommandHandler.h;h=da2d92123b89ff60dce1c9ed486aa00bc01be5d5;hb=fa4b80dfb92e15862041715cd3f1cbbf3f244f1e;hp=58dc67e2cd73cf90b783d9a00ce8ce375cb845f4;hpb=8fa354734e6dd2fd2e6fae68f7bbaf7ea84cbdfd;p=deb_libcec.git diff --git a/src/lib/implementations/CECCommandHandler.h b/src/lib/implementations/CECCommandHandler.h index 58dc67e..da2d921 100644 --- a/src/lib/implementations/CECCommandHandler.h +++ b/src/lib/implementations/CECCommandHandler.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,16 +31,89 @@ * http://www.pulse-eight.net/ */ -#include +#include "../../../include/cectypes.h" #include -#include "../util/StdString.h" -#include "../platform/threads.h" +#include +#include "../platform/threads/mutex.h" +#include "../platform/util/StdString.h" namespace CEC { class CCECProcessor; class CCECBusDevice; + 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(); + } + + private: + cec_opcode m_opcode; + PLATFORM::CEvent m_event; + }; + + class CWaitForResponse + { + public: + CWaitForResponse(void) {} + ~CWaitForResponse(void) + { + PLATFORM::CLockObject lock(m_mutex); + m_waitingFor.clear(); + } + + bool Wait(cec_opcode opcode, uint32_t iTimeout = 2000) + { + CResponse *response = GetEvent(opcode); + return response ? response->Wait(iTimeout) : false; + } + + void Received(cec_opcode opcode) + { + CResponse *response = GetEvent(opcode); + if (response) + response->Broadcast(); + } + + 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; + } + } + + PLATFORM::CMutex m_mutex; + std::map m_waitingFor; + }; + class CCECCommandHandler { public: @@ -48,13 +121,16 @@ namespace CEC virtual ~CCECCommandHandler(void); virtual bool HandleCommand(const cec_command &command); - virtual cec_vendor_id GetVendorId(void) { return CEC_VENDOR_UNKNOWN; }; - virtual void HandlePoll(const cec_logical_address iInitiator, const cec_logical_address iDestination); - virtual bool HandleReceiveFailed(void); + virtual cec_vendor_id GetVendorId(void) { return m_vendorId; }; + virtual void SetVendorId(cec_vendor_id vendorId) { m_vendorId = vendorId; } + static bool HasSpecificHandler(cec_vendor_id vendorId) { return vendorId == CEC_VENDOR_LG || vendorId == CEC_VENDOR_SAMSUNG || vendorId == CEC_VENDOR_PANASONIC;} virtual bool InitHandler(void) { return true; } + virtual bool ActivateSource(void); + virtual uint8_t GetTransmitRetries(void) const { return m_iTransmitRetries; } - virtual bool TransmitPowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination); + virtual bool PowerOn(const cec_logical_address iInitiator, const cec_logical_address iDestination); + virtual bool TransmitImageViewOn(const cec_logical_address iInitiator, const cec_logical_address iDestination); virtual bool TransmitStandby(const cec_logical_address iInitiator, const cec_logical_address iDestination); virtual bool TransmitRequestCecVersion(const cec_logical_address iInitiator, const cec_logical_address iDestination); virtual bool TransmitRequestMenuLanguage(const cec_logical_address iInitiator, const cec_logical_address iDestination); @@ -69,6 +145,7 @@ namespace CEC virtual bool TransmitOSDName(const cec_logical_address iInitiator, const cec_logical_address iDestination, CStdString strDeviceName); virtual bool TransmitOSDString(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_display_control duration, const char *strMessage); virtual bool TransmitPhysicalAddress(const cec_logical_address iInitiator, uint16_t iPhysicalAddress, cec_device_type type); + virtual bool TransmitSetMenuLanguage(const cec_logical_address iInitiator, const char lang[3]); virtual bool TransmitPoll(const cec_logical_address iInitiator, const cec_logical_address iDestination); virtual bool TransmitPowerState(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_power_status state); virtual bool TransmitVendorID(const cec_logical_address iInitiator, uint64_t iVendorId); @@ -76,8 +153,10 @@ namespace CEC virtual bool TransmitSetSystemAudioMode(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_system_audio_status state); virtual bool TransmitSystemAudioModeStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_system_audio_status state); virtual bool TransmitDeckStatus(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_deck_info state); - virtual bool SendKeypress(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_user_control_code key); - virtual bool SendKeyRelease(const cec_logical_address iInitiator, const cec_logical_address iDestination); + virtual bool TransmitKeypress(const cec_logical_address iInitiator, const cec_logical_address iDestination, cec_user_control_code key, bool bWait = true); + virtual bool TransmitKeyRelease(const cec_logical_address iInitiator, const cec_logical_address iDestination, bool bWait = true); + virtual bool TransmitSetStreamPath(uint16_t iStreamPath); + virtual bool SendDeckStatusUpdateOnActiveSource(void) const { return m_bOPTSendDeckStatusUpdateOnActiveSource; }; protected: virtual bool HandleActiveSource(const cec_command &command); @@ -85,6 +164,7 @@ namespace CEC virtual bool HandleDeviceCecVersion(const cec_command &command); virtual bool HandleDeviceVendorCommandWithId(const cec_command &command); virtual bool HandleDeviceVendorId(const cec_command &command); + virtual bool HandleFeatureAbort(const cec_command &command); virtual bool HandleGetCecVersion(const cec_command &command); virtual bool HandleGiveAudioStatus(const cec_command &command); virtual bool HandleGiveDeckStatus(const cec_command &command); @@ -92,9 +172,11 @@ namespace CEC virtual bool HandleGiveDeviceVendorId(const cec_command &command); virtual bool HandleGiveOSDName(const cec_command &command); virtual bool HandleGivePhysicalAddress(const cec_command &command); + virtual bool HandleGiveMenuLanguage(const cec_command &command); virtual bool HandleGiveSystemAudioModeStatus(const cec_command &command); virtual bool HandleImageViewOn(const cec_command &command); virtual bool HandleMenuRequest(const cec_command &command); + virtual bool HandlePoll(const cec_command &command); virtual bool HandleReportAudioStatus(const cec_command &command); virtual bool HandleReportPhysicalAddress(const cec_command &command); virtual bool HandleReportPowerStatus(const cec_command &command); @@ -111,9 +193,10 @@ namespace CEC virtual bool HandleTextViewOn(const cec_command &command); virtual bool HandleUserControlPressed(const cec_command &command); virtual bool HandleUserControlRelease(const cec_command &command); + virtual bool HandleVendorCommand(const cec_command &command); virtual void UnhandledCommand(const cec_command &command); - virtual unsigned int GetMyDevices(std::vector &devices) const; + virtual size_t GetMyDevices(std::vector &devices) const; virtual CCECBusDevice *GetDevice(cec_logical_address iLogicalAddress) const; virtual CCECBusDevice *GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress) const; virtual CCECBusDevice *GetDeviceByType(cec_device_type type) const; @@ -121,11 +204,16 @@ namespace CEC virtual bool SetVendorId(const cec_command &command); virtual void SetPhysicalAddress(cec_logical_address iAddress, uint16_t iNewAddress); - virtual bool Transmit(cec_command &command); + virtual bool Transmit(cec_command &command, bool bExpectResponse = true, cec_opcode expectedResponse = CEC_OPCODE_NONE); - CCECBusDevice *m_busDevice; - CCECProcessor *m_processor; - int32_t m_iTransmitTimeout; - CCondition m_condition; + CCECBusDevice * m_busDevice; + CCECProcessor * m_processor; + int32_t m_iTransmitTimeout; + int32_t m_iTransmitWait; + int8_t m_iTransmitRetries; + bool m_bHandlerInited; + bool m_bOPTSendDeckStatusUpdateOnActiveSource; + cec_vendor_id m_vendorId; + CWaitForResponse *m_waitForResponse; }; };