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-gui: fixed application exit when the user clicked 'no' when asked to recon...
[deb_libcec.git]
/
src
/
lib
/
devices
/
CECBusDevice.h
diff --git
a/src/lib/devices/CECBusDevice.h
b/src/lib/devices/CECBusDevice.h
index 2bef3a7657d5f61afb81c55f76d02e1950edfc9d..30ac2dc788df51c50251eaae0c8a4488799ccc03 100644
(file)
--- a/
src/lib/devices/CECBusDevice.h
+++ b/
src/lib/devices/CECBusDevice.h
@@
-2,7
+2,7
@@
/*
* This file is part of the libCEC(R) library.
*
/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011 Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011
-2012
Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
@@
-31,27
+31,24
@@
* http://www.pulse-eight.net/
*/
* http://www.pulse-eight.net/
*/
-#include
<cectypes.h>
+#include
"../../../include/cectypes.h"
#include <set>
#include <set>
-#include "../platform/threads.h"
-#include "../util/StdString.h"
+#include "../platform/threads
/mutex
.h"
+#include "../
platform/
util/StdString.h"
namespace CEC
{
class CCECProcessor;
class CCECCommandHandler;
namespace CEC
{
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);
virtual ~CCECBusDevice(void);
public:
CCECBusDevice(CCECProcessor *processor, cec_logical_address address, uint16_t iPhysicalAddress = 0);
virtual ~CCECBusDevice(void);
- virtual void AddLog(cec_log_level level, const CStdString &strMessage);
virtual bool HandleCommand(const cec_command &command);
virtual bool PowerOn(void);
virtual bool Standby(void);
virtual bool HandleCommand(const cec_command &command);
virtual bool PowerOn(void);
virtual bool Standby(void);
@@
-77,6
+74,8
@@
namespace CEC
virtual bool IsActiveSource(void) const { return m_bActiveSource; }
virtual bool IsUnsupportedFeature(cec_opcode opcode) const;
virtual void SetUnsupportedFeature(cec_opcode opcode);
virtual bool IsActiveSource(void) const { return m_bActiveSource; }
virtual bool IsUnsupportedFeature(cec_opcode opcode) const;
virtual void SetUnsupportedFeature(cec_opcode opcode);
+ virtual void HandlePoll(cec_logical_address initiator);
+ virtual bool HandleReceiveFailed(void);
virtual void SetInactiveSource(void);
virtual void SetActiveSource(void);
virtual void SetInactiveSource(void);
virtual void SetActiveSource(void);
@@
-95,6
+94,7
@@
namespace CEC
virtual bool TransmitActiveSource(void);
virtual bool TransmitCECVersion(cec_logical_address dest);
virtual bool TransmitActiveSource(void);
virtual bool TransmitCECVersion(cec_logical_address dest);
+ virtual bool TransmitImageViewOn(void);
virtual bool TransmitInactiveSource(void);
virtual bool TransmitMenuState(cec_logical_address dest);
virtual bool TransmitOSDName(cec_logical_address dest);
virtual bool TransmitInactiveSource(void);
virtual bool TransmitMenuState(cec_logical_address dest);
virtual bool TransmitOSDName(cec_logical_address dest);
@@
-106,8
+106,12
@@
namespace CEC
virtual bool TransmitKeypress(cec_user_control_code key, bool bWait = true);
virtual bool TransmitKeyRelease(bool bWait = true);
virtual bool TransmitKeypress(cec_user_control_code key, bool bWait = true);
virtual bool TransmitKeyRelease(bool bWait = true);
+ bool ReplaceHandler(bool bActivateSource = true);
+
protected:
protected:
- bool ReplaceHandler(bool bInitHandler = true);
+ void CheckVendorIdRequested(void);
+ void MarkBusy(void);
+ void MarkReady(void);
bool RequestCecVersion(void);
bool RequestMenuLanguage(void);
bool RequestCecVersion(void);
bool RequestMenuLanguage(void);
@@
-136,7
+140,11
@@
namespace CEC
cec_version m_cecVersion;
cec_bus_device_status m_deviceStatus;
std::set<cec_opcode> m_unsupportedFeatures;
cec_version m_cecVersion;
cec_bus_device_status m_deviceStatus;
std::set<cec_opcode> m_unsupportedFeatures;
- CMutex m_mutex;
- CMutex m_handlerMutex;
+ PLATFORM::CMutex m_mutex;
+ PLATFORM::CMutex m_handlerMutex;
+ PLATFORM::CEvent m_replacing;
+ unsigned m_iHandlerUseCount;
+ bool m_bAwaitingReceiveFailed;
+ bool m_bVendorIdRequested;
};
};
};
};