class CCECProcessor : public CThread
{
public:
- CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS);
- CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, const cec_device_type_list &types);
+ CCECProcessor(CLibCEC *controller, const char *strDeviceName, cec_logical_address iLogicalAddress = CECDEVICE_PLAYBACKDEVICE1, uint16_t iPhysicalAddress = CEC_DEFAULT_PHYSICAL_ADDRESS);
+ CCECProcessor(CLibCEC *controller, const char *strDeviceName, const cec_device_type_list &types);
virtual ~CCECProcessor(void);
- virtual bool Start(void);
+ virtual bool Start(const char *strPort, uint16_t iBaudRate = 38400, uint32_t iTimeoutMs = 10000);
virtual void *Process(void);
virtual bool IsMonitoring(void) const { return m_bMonitor; }
virtual cec_logical_address GetLogicalAddress(void) const { return m_logicalAddresses.primary; }
virtual cec_logical_addresses GetLogicalAddresses(void) const { return m_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 IsActiveDevice(cec_logical_address address);
virtual bool IsActiveDeviceType(cec_device_type type);
virtual uint16_t GetPhysicalAddress(void) const;
+ virtual uint64_t GetLastTransmission(void) const { return m_iLastTransmission; }
+ virtual bool IsStarted(void) const { return m_bStarted; }
+ virtual cec_logical_address GetActiveSource(void);
+ virtual bool IsActiveSource(cec_logical_address iAddress);
virtual bool SetActiveView(void);
virtual bool SetActiveSource(cec_device_type type = CEC_DEVICE_TYPE_RESERVED);
- virtual bool SetActiveSource(cec_logical_address iAddress);
virtual bool SetDeckControlMode(cec_deck_control_mode mode, bool bSendUpdate = true);
virtual bool SetDeckInfo(cec_deck_info info, bool bSendUpdate = true);
virtual bool SetHDMIPort(cec_logical_address iBaseDevice, uint8_t iPort, bool bForce = false);
virtual bool SetStreamPath(uint16_t iStreamPath);
virtual bool SwitchMonitoring(bool bEnable);
virtual bool PollDevice(cec_logical_address iAddress);
- virtual uint8_t VolumeUp(bool bWait = true);
- virtual uint8_t VolumeDown(bool bWait = true);
- virtual uint8_t MuteAudio(bool bWait = true);
- virtual bool SendKeypress(cec_logical_address iDestination, cec_user_control_code key, bool bWait = false);
- virtual bool SendKeyRelease(cec_logical_address iDestination, bool bWait = false);
+ virtual uint8_t VolumeUp(void);
+ virtual uint8_t VolumeDown(void);
+ virtual uint8_t MuteAudio(void);
+ virtual bool TransmitKeypress(cec_logical_address iDestination, cec_user_control_code key);
+ virtual bool TransmitKeyRelease(cec_logical_address iDestination);
virtual bool EnablePhysicalAddressDetection(void) { return false; };
+ void SetStandardLineTimeout(uint8_t iTimeout);
+ void SetRetryLineTimeout(uint8_t iTimeout);
+
+ bool SetLineTimeout(uint8_t iTimeout);
const char *ToString(const cec_menu_state state);
const char *ToString(const cec_version version);
virtual bool FindLogicalAddresses(void);
virtual bool SetAckMask(uint16_t iMask);
+ virtual bool StartBootloader(void);
+ virtual bool PingAdapter(void);
+
CCECBusDevice *m_busDevices[16];
+ CMutex m_transmitMutex;
private:
void ScanCECBus(void);
- bool CheckPhysicalAddress(uint16_t iPhysicalAddress);
+ bool PhysicalAddressInUse(uint16_t iPhysicalAddress);
bool TryLogicalAddress(cec_logical_address address);
bool FindLogicalAddressRecordingDevice(void);
bool FindLogicalAddressTuner(void);
bool FindLogicalAddressAudioSystem(void);
void LogOutput(const cec_command &data);
- bool WaitForTransmitSucceeded(uint8_t iLength, uint32_t iTimeout = 1000);
+ bool WaitForTransmitSucceeded(CCECAdapterMessage *message);
bool ParseMessage(const CCECAdapterMessage &msg);
void ParseCommand(cec_command &command);
cec_logical_address m_iBaseDevice;
cec_command m_currentframe;
cec_logical_addresses m_logicalAddresses;
+ cec_logical_address m_lastInitiator;
std::string m_strDeviceName;
cec_device_type_list m_types;
CMutex m_mutex;
CecBuffer<cec_command> m_commandBuffer;
cec_keypress m_previousKey;
CThread * m_busScan;
+ uint8_t m_iLineTimeout;
+ uint8_t m_iStandardLineTimeout;
+ uint8_t m_iRetryLineTimeout;
+ uint64_t m_iLastTransmission;
};
class CCECBusScan : public CThread
{
public:
CCECBusScan(CCECProcessor *processor) { m_processor = processor; }
- virtual ~CCECBusScan(void) {}
+ virtual ~CCECBusScan(void) { StopThread(true); }
virtual void *Process(void);
private:
+ void WaitUntilIdle(void);
+
CCECProcessor *m_processor;
};
};