repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: missing return statement in CCECCommandHandler::InitHandler()
[deb_libcec.git]
/
src
/
lib
/
devices
/
CECBusDevice.h
diff --git
a/src/lib/devices/CECBusDevice.h
b/src/lib/devices/CECBusDevice.h
index 01b74c2de6b57fac04477f6f2e5569a4d01fdbd9..23b6c15cd5ec0d8cc51946b205be920140dda12c 100644
(file)
--- a/
src/lib/devices/CECBusDevice.h
+++ b/
src/lib/devices/CECBusDevice.h
@@
-39,10
+39,12
@@
namespace CEC
{
class CCECProcessor;
class CCECCommandHandler;
{
class CCECProcessor;
class CCECCommandHandler;
+ class CSLCommandHandler;
class CCECBusDevice
{
friend class CCECProcessor;
class CCECBusDevice
{
friend class CCECProcessor;
+ friend class CSLCommandHandler;
public:
CCECBusDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress = 0);
public:
CCECBusDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress = 0);
@@
-53,34
+55,28
@@
namespace CEC
virtual bool PowerOn(void);
virtual bool Standby(void);
virtual bool PowerOn(void);
virtual bool Standby(void);
- virtual cec_version GetCecVersion(
void
);
+ virtual cec_version GetCecVersion(
bool bUpdate = false
);
virtual CCECCommandHandler * GetHandler(void) const { return m_handler; };
virtual CCECCommandHandler * GetHandler(void) const { return m_handler; };
- virtual uint64_t GetLastCommandSent(void) const;
virtual uint64_t GetLastActive(void) const { return m_iLastActive; }
virtual cec_logical_address GetLogicalAddress(void) const { return m_iLogicalAddress; }
virtual const char* GetLogicalAddressName(void) const;
virtual uint64_t GetLastActive(void) const { return m_iLastActive; }
virtual cec_logical_address GetLogicalAddress(void) const { return m_iLogicalAddress; }
virtual const char* GetLogicalAddressName(void) const;
- virtual cec_menu_language & GetMenuLanguage(
void
);
+ virtual cec_menu_language & GetMenuLanguage(
bool bUpdate = false
);
virtual cec_logical_address GetMyLogicalAddress(void) const;
virtual uint16_t GetMyPhysicalAddress(void) const;
virtual cec_logical_address GetMyLogicalAddress(void) const;
virtual uint16_t GetMyPhysicalAddress(void) const;
- virtual CStdString GetOSDName(
void
);
- virtual uint16_t GetPhysicalAddress(bool b
Refresh = tru
e);
- virtual cec_power_status GetPowerStatus(
void
);
+ virtual CStdString GetOSDName(
bool bUpdate = false
);
+ virtual uint16_t GetPhysicalAddress(bool b
Update = fals
e);
+ virtual cec_power_status GetPowerStatus(
bool bUpdate = false
);
virtual CCECProcessor * GetProcessor(void) const { return m_processor; }
virtual cec_device_type GetType(void) const { return m_type; }
virtual CCECProcessor * GetProcessor(void) const { return m_processor; }
virtual cec_device_type GetType(void) const { return m_type; }
- virtual cec_vendor_id GetVendorId(
void
);
- virtual const char * GetVendorName(
void
);
+ virtual cec_vendor_id GetVendorId(
bool bUpdate = false
);
+ virtual const char * GetVendorName(
bool bUpdate = false
);
virtual bool MyLogicalAddressContains(cec_logical_address address) const;
virtual cec_bus_device_status GetStatus(bool bForcePoll = false);
virtual bool MyLogicalAddressContains(cec_logical_address address) const;
virtual cec_bus_device_status GetStatus(bool bForcePoll = false);
+ virtual bool IsActiveSource(void) const { return m_bActiveSource; }
- bool RequestCecVersion(void);
- bool RequestMenuLanguage(void);
- bool RequestPowerStatus(void);
- bool RequestVendorId(void);
- bool RequestPhysicalAddress(void);
- bool RequestOSDName(void);
- virtual void SetInactive
Devi
ce(void);
- virtual void SetActive
Devi
ce(void);
+ virtual void SetInactive
Sour
ce(void);
+ virtual void SetActive
Sour
ce(void);
virtual bool TryLogicalAddress(void);
virtual void SetDeviceStatus(const cec_bus_device_status newStatus);
virtual bool TryLogicalAddress(void);
virtual void SetDeviceStatus(const cec_bus_device_status newStatus);
@@
-90,7
+86,7
@@
namespace CEC
virtual void SetMenuLanguage(const cec_menu_language &menuLanguage);
virtual void SetOSDName(CStdString strName);
virtual void SetMenuState(const cec_menu_state state);
virtual void SetMenuLanguage(const cec_menu_language &menuLanguage);
virtual void SetOSDName(CStdString strName);
virtual void SetMenuState(const cec_menu_state state);
- virtual
void SetVendorId(uint64_t iVendorId
);
+ virtual
bool SetVendorId(uint64_t iVendorId, bool bInitHandler = true
);
virtual void SetPowerStatus(const cec_power_status powerStatus);
virtual bool TransmitActiveSource(void);
virtual void SetPowerStatus(const cec_power_status powerStatus);
virtual bool TransmitActiveSource(void);
@@
-102,11
+98,18
@@
namespace CEC
virtual bool TransmitPhysicalAddress(void);
virtual bool TransmitPowerState(cec_logical_address dest);
virtual bool TransmitPoll(cec_logical_address dest);
virtual bool TransmitPhysicalAddress(void);
virtual bool TransmitPowerState(cec_logical_address dest);
virtual bool TransmitPoll(cec_logical_address dest);
- virtual bool TransmitVendorID(cec_logical_address dest);
- virtual bool
Send
Keypress(cec_user_control_code key, bool bWait = true);
- virtual bool
Send
KeyRelease(bool bWait = true);
+ virtual bool TransmitVendorID(cec_logical_address dest
, bool bSendAbort = true
);
+ virtual bool
Transmit
Keypress(cec_user_control_code key, bool bWait = true);
+ virtual bool
Transmit
KeyRelease(bool bWait = true);
protected:
protected:
+ bool RequestCecVersion(void);
+ bool RequestMenuLanguage(void);
+ bool RequestPowerStatus(void);
+ bool RequestVendorId(void);
+ bool RequestPhysicalAddress(void);
+ bool RequestOSDName(void);
+
bool NeedsPoll(void);
cec_device_type m_type;
bool NeedsPoll(void);
cec_device_type m_type;
@@
-121,13
+124,10
@@
namespace CEC
cec_vendor_id m_vendor;
cec_menu_state m_menuState;
bool m_bActiveSource;
cec_vendor_id m_vendor;
cec_menu_state m_menuState;
bool m_bActiveSource;
- uint64_t m_iLastCommandSent;
uint64_t m_iLastActive;
cec_version m_cecVersion;
cec_bus_device_status m_deviceStatus;
uint64_t m_iLastActive;
cec_version m_cecVersion;
cec_bus_device_status m_deviceStatus;
- CMutex m_transmitMutex;
CMutex m_writeMutex;
CMutex m_mutex;
CMutex m_writeMutex;
CMutex m_mutex;
- CCondition m_condition;
};
};
};
};