X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=25b0c2aa10f75d627191807155d87bac85fd4847;hb=a75e3a5a63546d6f7e670bc2a7a1931887a5d2a0;hp=2fc12e0666989a0d7b4aec030d68c9533d548262;hpb=7bdfd76c3fd005de0f8ac49e9f3879c018a9e518;p=deb_libcec.git diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index 2fc12e0..25b0c2a 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -40,14 +40,66 @@ namespace CEC { class CLibCEC; - struct IAdapterCommunication; + class IAdapterCommunication; class CCECBusDevice; + // a buffer that priotises the input from the TV. + // if we need more than this, we'll have to change it into a priority_queue + class CCECInputBuffer + { + public: + CCECInputBuffer(void) : m_bHasData(false) {} + virtual ~CCECInputBuffer(void) + { + m_condition.Broadcast(); + } + + bool Push(const cec_command &command) + { + bool bReturn(false); + PLATFORM::CLockObject lock(m_mutex); + if (command.initiator == CECDEVICE_TV) + bReturn = m_tvInBuffer.Push(command); + else + bReturn = m_inBuffer.Push(command); + + m_bHasData |= bReturn; + if (m_bHasData) + m_condition.Signal(); + + return bReturn; + } + + bool Pop(cec_command &command, uint16_t iTimeout = 10000) + { + bool bReturn(false); + PLATFORM::CLockObject lock(m_mutex); + if (m_tvInBuffer.IsEmpty() && m_inBuffer.IsEmpty() && + !m_condition.Wait(m_mutex, m_bHasData, iTimeout)) + return bReturn; + + if (m_tvInBuffer.Pop(command)) + bReturn = true; + else if (m_inBuffer.Pop(command)) + bReturn = true; + + m_bHasData = !m_tvInBuffer.IsEmpty() || !m_inBuffer.IsEmpty(); + return bReturn; + } + + private: + PLATFORM::CMutex m_mutex; + PLATFORM::CCondition m_condition; + volatile bool m_bHasData; + PLATFORM::SyncedBuffer m_tvInBuffer; + PLATFORM::SyncedBuffer m_inBuffer; + }; + class CCECProcessor : public PLATFORM::CThread, public IAdapterCommunicationCallback { public: CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress); - CCECProcessor(CLibCEC *controller, const libcec_configuration *configuration); + CCECProcessor(CLibCEC *controller, libcec_configuration *configuration); virtual ~CCECProcessor(void); virtual bool Start(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000); @@ -57,7 +109,7 @@ namespace CEC virtual bool OnCommandReceived(const cec_command &command); virtual bool IsMonitoring(void) const { return m_bMonitor; } - virtual CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress, bool bRefresh = false) const; + virtual CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress, bool bRefresh = false, bool bSuppressPoll = false) const; virtual CCECBusDevice * GetDeviceByType(cec_device_type type) const; virtual CCECBusDevice * GetPrimaryDevice(void) const; virtual cec_version GetDeviceCecVersion(cec_logical_address iAddress); @@ -71,11 +123,11 @@ namespace CEC virtual cec_osd_name GetDeviceOSDName(cec_logical_address iAddress); virtual uint64_t GetDeviceVendorId(cec_logical_address iAddress); virtual cec_power_status GetDevicePowerStatus(cec_logical_address iAddress); - virtual cec_logical_address GetLogicalAddress(void) const { return m_logicalAddresses.primary; } - virtual cec_logical_addresses GetLogicalAddresses(void) const { return m_logicalAddresses; } + virtual cec_logical_address GetLogicalAddress(void) const { return m_configuration.logicalAddresses.primary; } + virtual cec_logical_addresses GetLogicalAddresses(void) const { return m_configuration.logicalAddresses; } virtual cec_logical_addresses GetActiveDevices(void); virtual uint16_t GetDevicePhysicalAddress(cec_logical_address iAddress); - virtual bool HasLogicalAddress(cec_logical_address address) const { return m_logicalAddresses.IsSet(address); } + virtual bool HasLogicalAddress(cec_logical_address address) const { return m_configuration.logicalAddresses.IsSet(address); } virtual bool IsPresentDevice(cec_logical_address address); virtual bool IsPresentDeviceType(cec_device_type type); virtual uint16_t GetPhysicalAddress(void) const; @@ -84,7 +136,7 @@ namespace CEC virtual bool IsActiveSource(cec_logical_address iAddress); virtual bool IsInitialised(void); virtual bool SetStreamPath(uint16_t iPhysicalAddress); - virtual cec_client_version GetClientVersion(void) const { return m_configuration.clientVersion; }; + virtual cec_client_version GetClientVersion(void) const { return (cec_client_version)m_configuration.clientVersion; }; virtual bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST); virtual bool PowerOnDevices(cec_logical_address address = CECDEVICE_BROADCAST); @@ -105,13 +157,14 @@ namespace CEC virtual uint8_t MuteAudio(bool bSendRelease = true); virtual bool TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = true); virtual bool TransmitKeyRelease(cec_logical_address iDestination, bool bWait = true); - virtual bool EnablePhysicalAddressDetection(void) { return false; }; + virtual bool EnablePhysicalAddressDetection(void); void SetStandardLineTimeout(uint8_t iTimeout); void SetRetryLineTimeout(uint8_t iTimeout); virtual bool GetCurrentConfiguration(libcec_configuration *configuration); virtual bool SetConfiguration(const libcec_configuration *configuration); virtual bool CanPersistConfiguration(void); virtual bool PersistConfiguration(libcec_configuration *configuration); + virtual void RescanActiveDevices(void); bool SetLineTimeout(uint8_t iTimeout); @@ -127,6 +180,7 @@ namespace CEC const char *ToString(const cec_audio_status status); const char *ToString(const cec_vendor_id vendor); const char *ToString(const cec_client_version version); + const char *ToString(const cec_server_version version); virtual bool Transmit(const cec_command &data); virtual void TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE); @@ -135,22 +189,22 @@ namespace CEC virtual bool FindLogicalAddresses(void); virtual bool SetAckMask(uint16_t iMask); - virtual bool StartBootloader(void); + virtual bool StartBootloader(const char *strPort = NULL); virtual bool PingAdapter(void); virtual void HandlePoll(cec_logical_address initiator, cec_logical_address destination); virtual bool HandleReceiveFailed(cec_logical_address initiator); + virtual bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = 10000); + CCECBusDevice * m_busDevices[16]; - PLATFORM::CMutex m_transmitMutex; private: - bool OpenConnection(const char *strPort, uint16_t iBaudRate, uint32_t iTimeoutMs); + bool OpenConnection(const char *strPort, uint16_t iBaudRate, uint32_t iTimeoutMs, bool bStartListening = true); bool Initialise(void); void SetInitialised(bool bSetTo = true); void CreateBusDevices(void); void ReplaceHandlers(void); - void ScanCECBus(void); bool PhysicalAddressInUse(uint16_t iPhysicalAddress); bool TryLogicalAddress(cec_logical_address address); bool FindLogicalAddressRecordingDevice(void); @@ -161,19 +215,18 @@ namespace CEC void LogOutput(const cec_command &data); void ParseCommand(const cec_command &command); + bool m_bConnectionOpened; bool m_bInitialised; - cec_logical_addresses m_logicalAddresses; PLATFORM::CMutex m_mutex; IAdapterCommunication * m_communication; CLibCEC* m_controller; bool m_bMonitor; - PLATFORM::SyncedBuffer m_commandBuffer; cec_keypress m_previousKey; PLATFORM::CThread * m_busScan; - uint8_t m_iLineTimeout; uint8_t m_iStandardLineTimeout; uint8_t m_iRetryLineTimeout; uint64_t m_iLastTransmission; + CCECInputBuffer m_inBuffer; libcec_configuration m_configuration; };