repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: fix reconnect
[deb_libcec.git]
/
src
/
lib
/
LibCEC.cpp
diff --git
a/src/lib/LibCEC.cpp
b/src/lib/LibCEC.cpp
index 47554d662a921faa39637f220855f9abae552586..abc800c19cc528af2ff0029f43b6787a9f9a5625 100644
(file)
--- a/
src/lib/LibCEC.cpp
+++ b/
src/lib/LibCEC.cpp
@@
-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;
@@
-61,7
+62,10
@@
CLibCEC::~CLibCEC(void)
bool CLibCEC::Open(const char *strPort, uint64_t iTimeoutMs /* = 10000 */)
{
if (!m_comm)
bool CLibCEC::Open(const char *strPort, uint64_t iTimeoutMs /* = 10000 */)
{
if (!m_comm)
+ {
+ AddLog(CEC_LOG_ERROR, "no comm port");
return false;
return false;
+ }
if (m_comm->IsOpen())
{
if (m_comm->IsOpen())
{
@@
-87,17
+91,9
@@
bool CLibCEC::Open(const char *strPort, uint64_t iTimeoutMs /* = 10000 */)
void CLibCEC::Close(void)
{
if (m_cec)
void CLibCEC::Close(void)
{
if (m_cec)
- {
m_cec->StopThread();
m_cec->StopThread();
- delete m_cec;
- m_cec = NULL;
- }
if (m_comm)
if (m_comm)
- {
m_comm->Close();
m_comm->Close();
- delete m_comm;
- m_comm = NULL;
- }
}
int CLibCEC::FindAdapters(std::vector<cec_adapter> &deviceList, const char *strDevicePath /* = NULL */)
}
int CLibCEC::FindAdapters(std::vector<cec_adapter> &deviceList, const char *strDevicePath /* = NULL */)