repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: ensure that the connection is really closed before retrying to connect. bugzig...
[deb_libcec.git]
/
src
/
lib
/
LibCEC.cpp
diff --git
a/src/lib/LibCEC.cpp
b/src/lib/LibCEC.cpp
index 01ce2cf3e406f20904dc6b39413ca27e2b93f909..a289b75c47fe9bda4b0cfc051c85b74a4fd88364 100644
(file)
--- a/
src/lib/LibCEC.cpp
+++ b/
src/lib/LibCEC.cpp
@@
-60,6
+60,7
@@
CLibCEC::CLibCEC(libcec_configuration *configuration) :
m_cbParam(configuration->callbackParam)
{
m_cec = new CCECProcessor(this, configuration);
m_cbParam(configuration->callbackParam)
{
m_cec = new CCECProcessor(this, configuration);
+ configuration->serverVersion = CEC_SERVER_VERSION_1_5_0;
}
CLibCEC::~CLibCEC(void)
}
CLibCEC::~CLibCEC(void)
@@
-387,7
+388,8
@@
void CLibCEC::ConfigurationChanged(const libcec_configuration &config)
if (instance->m_callbacks &&
config.clientVersion >= CEC_CLIENT_VERSION_1_5_0 &&
if (instance->m_callbacks &&
config.clientVersion >= CEC_CLIENT_VERSION_1_5_0 &&
- instance->m_callbacks->CBCecConfigurationChanged != NULL)
+ instance->m_callbacks->CBCecConfigurationChanged != NULL &&
+ instance->m_cec->IsInitialised())
instance->m_callbacks->CBCecConfigurationChanged(instance->m_cbParam, config);
}
instance->m_callbacks->CBCecConfigurationChanged(instance->m_cbParam, config);
}
@@
-478,7
+480,7
@@
void CLibCEC::SetInstance(CLibCEC *instance)
g_libCEC_instance = instance;
}
g_libCEC_instance = instance;
}
-void * CECInit(const char *strDeviceName, CEC::cec_device_type_list types, uint16_t
iPhysicalAddress
/* = 0 */)
+void * CECInit(const char *strDeviceName, CEC::cec_device_type_list types, uint16_t
UNUSED(iPhysicalAddress)
/* = 0 */)
{
CLibCEC *lib = new CLibCEC(strDeviceName, types);
CLibCEC::SetInstance(lib);
{
CLibCEC *lib = new CLibCEC(strDeviceName, types);
CLibCEC::SetInstance(lib);
@@
-559,7
+561,7
@@
const char *CLibCEC::ToString(const cec_server_version version)
bool CLibCEC::GetCurrentConfiguration(libcec_configuration *configuration)
{
bool CLibCEC::GetCurrentConfiguration(libcec_configuration *configuration)
{
- return m_cec->GetCurrentConfiguration(configuration);
+ return m_cec->
IsInitialised() && m_cec->
GetCurrentConfiguration(configuration);
}
bool CLibCEC::SetConfiguration(const libcec_configuration *configuration)
}
bool CLibCEC::SetConfiguration(const libcec_configuration *configuration)
@@
-581,3
+583,10
@@
void CLibCEC::RescanActiveDevices(void)
{
return m_cec->RescanActiveDevices();
}
{
return m_cec->RescanActiveDevices();
}
+
+bool CLibCEC::IsLibCECActiveSource(void)
+{
+ return m_cec ?
+ m_cec->m_busDevices[m_cec->GetActiveSource()]->GetStatus(false) == CEC_DEVICE_STATUS_HANDLED_BY_LIBCEC :
+ false;
+}