repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into release
[deb_libcec.git]
/
src
/
lib
/
LibCEC.cpp
diff --git
a/src/lib/LibCEC.cpp
b/src/lib/LibCEC.cpp
index 23c4b18b544cd9be3886388389ab2b02b9e2c5a9..abc800c19cc528af2ff0029f43b6787a9f9a5625 100644
(file)
--- a/
src/lib/LibCEC.cpp
+++ b/
src/lib/LibCEC.cpp
@@
-36,12
+36,12
@@
#include "AdapterDetection.h"
#include "CECProcessor.h"
#include "util/StdString.h"
#include "AdapterDetection.h"
#include "CECProcessor.h"
#include "util/StdString.h"
-#include "
util
/timeutils.h"
+#include "
platform
/timeutils.h"
using namespace std;
using namespace CEC;
using namespace std;
using namespace CEC;
-CLibCEC::CLibCEC(const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */,
in
t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */) :
+CLibCEC::CLibCEC(const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */,
uint16_
t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */) :
m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN),
m_buttontime(0)
{
m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN),
m_buttontime(0)
{
@@
-51,6
+51,7
@@
CLibCEC::CLibCEC(const char *strDeviceName, cec_logical_address iLogicalAddress
CLibCEC::~CLibCEC(void)
{
CLibCEC::~CLibCEC(void)
{
+ Close();
delete m_cec;
m_cec = NULL;
delete m_cec;
m_cec = NULL;
@@
-58,10
+59,13
@@
CLibCEC::~CLibCEC(void)
m_comm = NULL;
}
m_comm = NULL;
}
-bool CLibCEC::Open(const char *strPort,
in
t iTimeoutMs /* = 10000 */)
+bool CLibCEC::Open(const char *strPort,
uint64_
t iTimeoutMs /* = 10000 */)
{
if (!m_comm)
{
if (!m_comm)
+ {
+ AddLog(CEC_LOG_ERROR, "no comm port");
return false;
return false;
+ }
if (m_comm->IsOpen())
{
if (m_comm->IsOpen())
{
@@
-225,7
+229,7
@@
void CLibCEC::SetCurrentButton(cec_user_control_code iButtonCode)
m_buttontime = GetTimeMs();
}
m_buttontime = GetTimeMs();
}
-DECLSPEC void * CECCreate(const char *strDeviceName, CEC::cec_logical_address iLogicalAddress /*= CEC::CECDEVICE_PLAYBACKDEVICE1 */,
in
t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */)
+DECLSPEC void * CECCreate(const char *strDeviceName, CEC::cec_logical_address iLogicalAddress /*= CEC::CECDEVICE_PLAYBACKDEVICE1 */,
uint16_
t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS */)
{
return static_cast< void* > (new CLibCEC(strDeviceName, iLogicalAddress, iPhysicalAddress));
}
{
return static_cast< void* > (new CLibCEC(strDeviceName, iLogicalAddress, iPhysicalAddress));
}