repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec-config: always set the hdmi port number and device, or v1.4- clients won't work...
[deb_libcec.git]
/
src
/
lib
/
CECProcessor.h
diff --git
a/src/lib/CECProcessor.h
b/src/lib/CECProcessor.h
index 53d9f6b5bfcf3da9e3e700e37f506c97c32624b5..5d0cfa2b53cbcab4e1d0fd7c49fa0d8d7f689f58 100644
(file)
--- a/
src/lib/CECProcessor.h
+++ b/
src/lib/CECProcessor.h
@@
-46,7
+46,8
@@
namespace CEC
class CCECProcessor : public PLATFORM::CThread, public IAdapterCommunicationCallback
{
public:
class CCECProcessor : public PLATFORM::CThread, public IAdapterCommunicationCallback
{
public:
- CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types);
+ CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress, cec_client_version clientVersion);
+ CCECProcessor(CLibCEC *controller, const libcec_configuration *configuration);
virtual ~CCECProcessor(void);
virtual bool Start(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000);
virtual ~CCECProcessor(void);
virtual bool Start(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000);
@@
-99,6
+100,9
@@
namespace CEC
virtual bool EnablePhysicalAddressDetection(void) { return false; };
void SetStandardLineTimeout(uint8_t iTimeout);
void SetRetryLineTimeout(uint8_t iTimeout);
virtual bool EnablePhysicalAddressDetection(void) { return false; };
void SetStandardLineTimeout(uint8_t iTimeout);
void SetRetryLineTimeout(uint8_t iTimeout);
+ virtual bool GetCurrentConfiguration(libcec_configuration *configuration);
+ virtual bool CanPersistConfiguration(void);
+ virtual bool PersistConfiguration(libcec_configuration *configuration);
bool SetLineTimeout(uint8_t iTimeout);
bool SetLineTimeout(uint8_t iTimeout);
@@
-113,6
+117,7
@@
namespace CEC
const char *ToString(const cec_system_audio_status mode);
const char *ToString(const cec_audio_status status);
const char *ToString(const cec_vendor_id vendor);
const char *ToString(const cec_system_audio_status mode);
const char *ToString(const cec_audio_status status);
const char *ToString(const cec_vendor_id vendor);
+ const char *ToString(const cec_client_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);
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);
@@
-133,6
+138,7
@@
namespace CEC
bool OpenConnection(const char *strPort, uint16_t iBaudRate, uint32_t iTimeoutMs);
bool Initialise(void);
void SetInitialised(bool bSetTo = true);
bool OpenConnection(const char *strPort, uint16_t iBaudRate, uint32_t iTimeoutMs);
bool Initialise(void);
void SetInitialised(bool bSetTo = true);
+ void CreateBusDevices(void);
void ReplaceHandlers(void);
void ScanCECBus(void);
void ReplaceHandlers(void);
void ScanCECBus(void);
@@
-147,6
+153,7
@@
namespace CEC
void ParseCommand(const cec_command &command);
bool m_bInitialised;
void ParseCommand(const cec_command &command);
bool m_bInitialised;
+ uint16_t m_iPhysicalAddress;
uint8_t m_iHDMIPort;
cec_logical_address m_iBaseDevice;
cec_logical_addresses m_logicalAddresses;
uint8_t m_iHDMIPort;
cec_logical_address m_iBaseDevice;
cec_logical_addresses m_logicalAddresses;
@@
-163,6
+170,7
@@
namespace CEC
uint8_t m_iStandardLineTimeout;
uint8_t m_iRetryLineTimeout;
uint64_t m_iLastTransmission;
uint8_t m_iStandardLineTimeout;
uint8_t m_iRetryLineTimeout;
uint64_t m_iLastTransmission;
+ cec_client_version m_clientVersion;
};
class CCECBusScan : public PLATFORM::CThread
};
class CCECBusScan : public PLATFORM::CThread