X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.h;h=3986862fe719f3f2730c56bd5cb1840cd700d4af;hb=5daed059e1d5bca3ddfa0787679ef4e7b349e382;hp=d5571046202caacc27b158d27af8be09c58cf5a9;hpb=e186a8436089dfa0f8a7cb65b00cbeb056923467;p=deb_libcec.git diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index d557104..3986862 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -70,7 +70,7 @@ namespace CEC return bReturn; } - bool Pop(cec_command &command, uint16_t iTimeout = 10000) + bool Pop(cec_command &command, uint16_t iTimeout) { bool bReturn(false); PLATFORM::CLockObject lock(m_mutex); @@ -102,14 +102,14 @@ namespace CEC CCECProcessor(CLibCEC *controller, libcec_configuration *configuration); virtual ~CCECProcessor(void); - bool Start(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000); + bool Start(const char *strPort, uint16_t iBaudRate = CEC_SERIAL_DEFAULT_BAUDRATE, uint32_t iTimeoutMs = CEC_DEFAULT_CONNECT_TIMEOUT); void *Process(void); void Close(void); bool OnCommandReceived(const cec_command &command); bool IsMonitoring(void) const { return m_bMonitor; } - CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress, bool bRefresh = false, bool bSuppressPoll = false) const; + CCECBusDevice * GetDeviceByPhysicalAddress(uint16_t iPhysicalAddress, bool bSuppressUpdate = true); CCECBusDevice * GetDeviceByType(cec_device_type type) const; CCECBusDevice * GetPrimaryDevice(void) const; cec_version GetDeviceCecVersion(cec_logical_address iAddress); @@ -127,7 +127,7 @@ namespace CEC bool IsPresentDeviceType(cec_device_type type); uint16_t GetPhysicalAddress(void) const; uint64_t GetLastTransmission(void) const { return m_iLastTransmission; } - cec_logical_address GetActiveSource(void); + cec_logical_address GetActiveSource(bool bRequestActiveSource = true); bool IsActiveSource(cec_logical_address iAddress); bool IsInitialised(void); bool SetStreamPath(uint16_t iPhysicalAddress); @@ -177,6 +177,8 @@ namespace CEC const char *ToString(const cec_client_version version); const char *ToString(const cec_server_version version); + static bool IsValidPhysicalAddress(uint16_t iPhysicalAddress); + bool Transmit(const cec_command &data); void TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE); @@ -189,7 +191,7 @@ namespace CEC void HandlePoll(cec_logical_address initiator, cec_logical_address destination); bool HandleReceiveFailed(cec_logical_address initiator); - bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = 10000); + bool GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs = CEC_DEFAULT_CONNECT_TIMEOUT); bool TransmitPendingActiveSourceCommands(void);