repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec-client: fixed entering bootloader mode
[deb_libcec.git]
/
src
/
lib
/
LibCEC.cpp
diff --git
a/src/lib/LibCEC.cpp
b/src/lib/LibCEC.cpp
index a59fae711964c3e1b32fded66d0793470eb9d505..88e93e0dcd07a2d3ae2c366c46d068219b8faa54 100644
(file)
--- a/
src/lib/LibCEC.cpp
+++ b/
src/lib/LibCEC.cpp
@@
-60,7
+60,6
@@
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_1;
m_cec = new CCECProcessor(this, configuration);
}
m_cec = new CCECProcessor(this, configuration);
}
@@
-69,7
+68,7
@@
CLibCEC::~CLibCEC(void)
delete m_cec;
}
delete m_cec;
}
-bool CLibCEC::Open(const char *strPort, uint32_t iTimeoutMs /* =
10000
*/)
+bool CLibCEC::Open(const char *strPort, uint32_t iTimeoutMs /* =
CEC_DEFAULT_CONNECT_TIMEOUT
*/)
{
if (m_cec->IsRunning())
{
{
if (m_cec->IsRunning())
{
@@
-77,7
+76,7
@@
bool CLibCEC::Open(const char *strPort, uint32_t iTimeoutMs /* = 10000 */)
return false;
}
return false;
}
- if (!m_cec->Start(strPort,
38400
, iTimeoutMs))
+ if (!m_cec->Start(strPort,
CEC_SERIAL_DEFAULT_BAUDRATE
, iTimeoutMs))
{
AddLog(CEC_LOG_ERROR, "could not start CEC communications");
return false;
{
AddLog(CEC_LOG_ERROR, "could not start CEC communications");
return false;
@@
-501,7
+500,7
@@
int CLibCEC::MenuStateChanged(const cec_menu_state newState)
bool CLibCEC::SetStreamPath(cec_logical_address iAddress)
{
uint16_t iPhysicalAddress = GetDevicePhysicalAddress(iAddress);
bool CLibCEC::SetStreamPath(cec_logical_address iAddress)
{
uint16_t iPhysicalAddress = GetDevicePhysicalAddress(iAddress);
- if (iPhysicalAddress !=
0xFFFF
)
+ if (iPhysicalAddress !=
CEC_INVALID_PHYSICAL_ADDRESS
)
return SetStreamPath(iPhysicalAddress);
return false;
}
return SetStreamPath(iPhysicalAddress);
return false;
}
@@
-541,6
+540,7
@@
void * CECInitialise(libcec_configuration *configuration)
{
CLibCEC *lib = new CLibCEC(configuration);
CLibCEC::SetInstance(lib);
{
CLibCEC *lib = new CLibCEC(configuration);
CLibCEC::SetInstance(lib);
+ lib->GetCurrentConfiguration(configuration);
return static_cast< void* > (lib);
}
return static_cast< void* > (lib);
}
@@
-551,7
+551,7
@@
bool CECStartBootloader(void)
if (CUSBCECAdapterDetection::FindAdapters(deviceList, 1) > 0)
{
CUSBCECAdapterCommunication comm(NULL, deviceList[0].comm);
if (CUSBCECAdapterDetection::FindAdapters(deviceList, 1) > 0)
{
CUSBCECAdapterCommunication comm(NULL, deviceList[0].comm);
- CTimeout timeout(
10000
);
+ CTimeout timeout(
CEC_DEFAULT_CONNECT_TIMEOUT
);
while (timeout.TimeLeft() > 0 && (bReturn = comm.Open(timeout.TimeLeft() / CEC_CONNECT_TRIES, true)) == false)
{
comm.Close();
while (timeout.TimeLeft() > 0 && (bReturn = comm.Open(timeout.TimeLeft() / CEC_CONNECT_TRIES, true)) == false)
{
comm.Close();
@@
-753,7
+753,7
@@
uint16_t CLibCEC::GetMaskForType(cec_device_type type)
}
}
}
}
-bool CLibCEC::GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs /* =
10000
*/)
+bool CLibCEC::GetDeviceInformation(const char *strPort, libcec_configuration *config, uint32_t iTimeoutMs /* =
CEC_DEFAULT_CONNECT_TIMEOUT
*/)
{
if (m_cec->IsRunning())
return false;
{
if (m_cec->IsRunning())
return false;