repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: updated changelog and bumped version numbers for 1.6.1
[deb_libcec.git]
/
src
/
lib
/
LibCEC.cpp
diff --git
a/src/lib/LibCEC.cpp
b/src/lib/LibCEC.cpp
index 2e149c7da0ce1b816be7a95f6fb98af719b439a9..20c670d3a6c028f020f80d055804076f8f4c1d3e 100644
(file)
--- a/
src/lib/LibCEC.cpp
+++ b/
src/lib/LibCEC.cpp
@@
-60,7
+60,7
@@
CLibCEC::CLibCEC(libcec_configuration *configuration) :
m_callbacks(configuration->callbacks),
m_cbParam(configuration->callbackParam)
{
m_callbacks(configuration->callbacks),
m_cbParam(configuration->callbackParam)
{
- configuration->serverVersion = CEC_SERVER_VERSION_1_6_
0
;
+ configuration->serverVersion = CEC_SERVER_VERSION_1_6_
1
;
m_cec = new CCECProcessor(this, configuration);
}
m_cec = new CCECProcessor(this, configuration);
}
@@
-510,7
+510,7
@@
bool CECStartBootloader(void)
{
CUSBCECAdapterCommunication comm(NULL, deviceList[0].comm);
CTimeout timeout(10000);
{
CUSBCECAdapterCommunication comm(NULL, deviceList[0].comm);
CTimeout timeout(10000);
- while (timeout.TimeLeft() > 0 && (bReturn = comm.Open(
NULL, (timeout.TimeLeft() / CEC_CONNECT_TRIES)), true
) == false)
+ while (timeout.TimeLeft() > 0 && (bReturn = comm.Open(
timeout.TimeLeft() / CEC_CONNECT_TRIES, true)
) == false)
{
comm.Close();
CEvent::Sleep(500);
{
comm.Close();
CEvent::Sleep(500);
@@
-587,6
+587,11
@@
const char *CLibCEC::ToString(const cec_server_version version)
return m_cec->ToString(version);
}
return m_cec->ToString(version);
}
+const char *CLibCEC::ToString(const cec_device_type type)
+{
+ return m_cec->ToString(type);
+}
+
bool CLibCEC::GetCurrentConfiguration(libcec_configuration *configuration)
{
return m_cec->IsInitialised() && m_cec->GetCurrentConfiguration(configuration);
bool CLibCEC::GetCurrentConfiguration(libcec_configuration *configuration)
{
return m_cec->IsInitialised() && m_cec->GetCurrentConfiguration(configuration);
@@
-712,4
+717,4
@@
bool CLibCEC::GetDeviceInformation(const char *strPort, libcec_configuration *co
return false;
return m_cec->GetDeviceInformation(strPort, config, iTimeoutMs);
return false;
return m_cec->GetDeviceInformation(strPort, config, iTimeoutMs);
-}
\ No newline at end of file
+}