repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: update m_iLineTimeout correctly in CUSBCECAdapterCommunication::SetLineTimeout()
[deb_libcec.git]
/
src
/
lib
/
CECProcessor.h
diff --git
a/src/lib/CECProcessor.h
b/src/lib/CECProcessor.h
index 5d0cfa2b53cbcab4e1d0fd7c49fa0d8d7f689f58..d2808443c34bbba3e5d2903670d7cc38e06661d0 100644
(file)
--- a/
src/lib/CECProcessor.h
+++ b/
src/lib/CECProcessor.h
@@
-40,14
+40,14
@@
namespace CEC
{
class CLibCEC;
namespace CEC
{
class CLibCEC;
-
struct
IAdapterCommunication;
+
class
IAdapterCommunication;
class CCECBusDevice;
class CCECProcessor : public PLATFORM::CThread, public IAdapterCommunicationCallback
{
public:
class CCECBusDevice;
class CCECProcessor : public PLATFORM::CThread, public IAdapterCommunicationCallback
{
public:
- 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);
+ CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types, uint16_t iPhysicalAddress);
+ CCECProcessor(CLibCEC *controller, 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);
@@
-62,15
+62,20
@@
namespace CEC
virtual CCECBusDevice * GetPrimaryDevice(void) const;
virtual cec_version GetDeviceCecVersion(cec_logical_address iAddress);
virtual bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language);
virtual CCECBusDevice * GetPrimaryDevice(void) const;
virtual cec_version GetDeviceCecVersion(cec_logical_address iAddress);
virtual bool GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language);
- virtual const std::string & GetDeviceName(void) { return m_strDeviceName; }
+ virtual CStdString GetDeviceName(void) const
+ {
+ CStdString strName;
+ strName = m_configuration.strDeviceName;
+ return strName;
+ }
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_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 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;
virtual bool IsPresentDevice(cec_logical_address address);
virtual bool IsPresentDeviceType(cec_device_type type);
virtual uint16_t GetPhysicalAddress(void) const;
@@
-79,6
+84,9
@@
namespace CEC
virtual bool IsActiveSource(cec_logical_address iAddress);
virtual bool IsInitialised(void);
virtual bool SetStreamPath(uint16_t iPhysicalAddress);
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 (cec_client_version)m_configuration.clientVersion; };
+ virtual bool StandbyDevices(cec_logical_address address = CECDEVICE_BROADCAST);
+ virtual bool PowerOnDevices(cec_logical_address address = CECDEVICE_BROADCAST);
virtual bool SetActiveView(void);
virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED);
virtual bool SetActiveView(void);
virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED);
@@
-97,12
+105,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 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);
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 bool CanPersistConfiguration(void);
virtual bool PersistConfiguration(libcec_configuration *configuration);
+ virtual void RescanActiveDevices(void);
bool SetLineTimeout(uint8_t iTimeout);
bool SetLineTimeout(uint8_t iTimeout);
@@
-118,6
+128,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_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);
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);
@@
-126,7
+137,7
@@
namespace CEC
virtual bool FindLogicalAddresses(void);
virtual bool SetAckMask(uint16_t iMask);
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 PingAdapter(void);
virtual void HandlePoll(cec_logical_address initiator, cec_logical_address destination);
virtual bool HandleReceiveFailed(cec_logical_address initiator);
@@
-141,7
+152,6
@@
namespace CEC
void CreateBusDevices(void);
void ReplaceHandlers(void);
void CreateBusDevices(void);
void ReplaceHandlers(void);
- void ScanCECBus(void);
bool PhysicalAddressInUse(uint16_t iPhysicalAddress);
bool TryLogicalAddress(cec_logical_address address);
bool FindLogicalAddressRecordingDevice(void);
bool PhysicalAddressInUse(uint16_t iPhysicalAddress);
bool TryLogicalAddress(cec_logical_address address);
bool FindLogicalAddressRecordingDevice(void);
@@
-152,25
+162,18
@@
namespace CEC
void LogOutput(const cec_command &data);
void ParseCommand(const cec_command &command);
void LogOutput(const cec_command &data);
void ParseCommand(const cec_command &command);
+ bool m_bConnectionOpened;
bool m_bInitialised;
bool m_bInitialised;
- uint16_t m_iPhysicalAddress;
- uint8_t m_iHDMIPort;
- cec_logical_address m_iBaseDevice;
- cec_logical_addresses m_logicalAddresses;
- std::string m_strDeviceName;
- cec_device_type_list m_types;
PLATFORM::CMutex m_mutex;
IAdapterCommunication * m_communication;
CLibCEC* m_controller;
bool m_bMonitor;
PLATFORM::CMutex m_mutex;
IAdapterCommunication * m_communication;
CLibCEC* m_controller;
bool m_bMonitor;
- PLATFORM::SyncedBuffer<cec_command> m_commandBuffer;
cec_keypress m_previousKey;
PLATFORM::CThread * m_busScan;
cec_keypress m_previousKey;
PLATFORM::CThread * m_busScan;
- uint8_t m_iLineTimeout;
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_clientVers
ion;
+
libcec_configuration m_configurat
ion;
};
class CCECBusScan : public PLATFORM::CThread
};
class CCECBusScan : public PLATFORM::CThread