CLockObject lock(m_mutex);
if (!m_communication)
{
- m_controller->AddLog(CEC_LOG_ERROR, "no connection handler found");
+ CLibCEC::AddLog(CEC_LOG_ERROR, "no connection handler found");
return bReturn;
}
/* check for an already opened connection */
if (m_communication->IsOpen())
{
- m_controller->AddLog(CEC_LOG_ERROR, "connection already opened");
+ CLibCEC::AddLog(CEC_LOG_ERROR, "connection already opened");
return bReturn;
}
/* open a new connection */
if ((bReturn = m_communication->Open(strPort, iBaudRate, iTimeoutMs)) == false)
- m_controller->AddLog(CEC_LOG_ERROR, "could not open a connection");
+ CLibCEC::AddLog(CEC_LOG_ERROR, "could not open a connection");
/* try to ping the adapter */
- if ((bReturn = m_communication->PingAdapter()) == false)
- m_controller->AddLog(CEC_LOG_ERROR, "the adapter does not respond correctly");
+ int iPingTry(0);
+ bool bPingOk(false);
+ while (!bPingOk && iPingTry++ < CEC_PING_ADAPTER_TRIES)
+ {
+ if ((bPingOk = m_communication->PingAdapter()) == false)
+ {
+ CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter did not respond correctly to a ping (try %d of %d)", iPingTry, CEC_PING_ADAPTER_TRIES);
+ Sleep(500);
+ }
+ }
- uint16_t iFirmwareVersion = m_communication->GetFirmwareVersion();
- if ((bReturn = (iFirmwareVersion != CEC_FW_VERSION_UNKNOWN)) == false)
- m_controller->AddLog(CEC_LOG_ERROR, "the adapter is running an unknown firmware version");
+ if (bPingOk)
+ {
+ uint16_t iFirmwareVersion(CEC_FW_VERSION_UNKNOWN);
+ int iFwVersionTry(0);
+ bool bFwVersionOk(false);
+ while (!bFwVersionOk && iFwVersionTry++ < CEC_FW_VERSION_TRIES)
+ {
+ if ((iFirmwareVersion = m_communication->GetFirmwareVersion()) == CEC_FW_VERSION_UNKNOWN)
+ {
+ CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter did not respond with a correct firmware version (try %d of %d)", iFwVersionTry, CEC_FW_VERSION_TRIES);
+ Sleep(500);
+ }
+ }
- CStdString strLog;
- strLog.Format("CEC Adapter firmware version: %d", iFirmwareVersion);
- m_controller->AddLog(CEC_LOG_NOTICE, strLog);
+ if (iFirmwareVersion == CEC_FW_VERSION_UNKNOWN)
+ {
+ bReturn = false;
+ }
+ else
+ {
+ bReturn = true;
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "CEC Adapter firmware version: %d", iFirmwareVersion);
+ }
+ }
return bReturn;
}
if (!FindLogicalAddresses())
{
- m_controller->AddLog(CEC_LOG_ERROR, "could not detect our logical addresses");
+ CLibCEC::AddLog(CEC_LOG_ERROR, "could not detect our logical addresses");
return bReturn;
}
ReplaceHandlers();
if ((bReturn = SetHDMIPort(m_iBaseDevice, m_iHDMIPort, true)) == false)
- {
- CStdString strLog;
- strLog.Format("unable to set HDMI port %d on %s (%x)", m_iHDMIPort, ToString(m_iBaseDevice), (uint8_t)m_iBaseDevice);
- m_controller->AddLog(CEC_LOG_ERROR, strLog);
- }
+ CLibCEC::AddLog(CEC_LOG_ERROR, "unable to set HDMI port %d on %s (%x)", m_iHDMIPort, ToString(m_iBaseDevice), (uint8_t)m_iBaseDevice);
SetInitialised(bReturn);
/* create the processor thread */
if (!CreateThread() || !m_startCondition.Wait(m_mutex) || !m_bStarted)
{
- m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+ CLibCEC::AddLog(CEC_LOG_ERROR, "could not create a processor thread");
return bReturn;
}
}
if ((bReturn = Initialise()) == false)
{
- m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+ CLibCEC::AddLog(CEC_LOG_ERROR, "could not create a processor thread");
StopThread(true);
}
else
{
- m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "processor thread started");
}
return bReturn;
bool CCECProcessor::FindLogicalAddressRecordingDevice(void)
{
- AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'recording device'");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'recording device'");
return TryLogicalAddress(CECDEVICE_RECORDINGDEVICE1) ||
TryLogicalAddress(CECDEVICE_RECORDINGDEVICE2) ||
TryLogicalAddress(CECDEVICE_RECORDINGDEVICE3);
bool CCECProcessor::FindLogicalAddressTuner(void)
{
- AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'tuner'");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'tuner'");
return TryLogicalAddress(CECDEVICE_TUNER1) ||
TryLogicalAddress(CECDEVICE_TUNER2) ||
TryLogicalAddress(CECDEVICE_TUNER3) ||
bool CCECProcessor::FindLogicalAddressPlaybackDevice(void)
{
- AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'playback device'");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'playback device'");
return TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE1) ||
TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE2) ||
TryLogicalAddress(CECDEVICE_PLAYBACKDEVICE3);
bool CCECProcessor::FindLogicalAddressAudioSystem(void)
{
- AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'audio'");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "detecting logical address for type 'audio'");
return TryLogicalAddress(CECDEVICE_AUDIOSYSTEM);
}
{
bool bChanged(false);
- CStdString strLog;
- strLog.Format("changing device type '%s' into '%s'", ToString(from), ToString(to));
- AddLog(CEC_LOG_NOTICE, strLog);
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "changing device type '%s' into '%s'", ToString(from), ToString(to));
CLockObject lock(m_mutex);
CCECBusDevice *previousDevice = GetDeviceByType(from);
{
bool bReturn(true);
m_logicalAddresses.Clear();
- CStdString strLog;
for (unsigned int iPtr = 0; iPtr < 5; iPtr++)
{
if (m_types.types[iPtr] == CEC_DEVICE_TYPE_RESERVED)
continue;
- strLog.Format("%s - device %d: type %d", __FUNCTION__, iPtr, m_types.types[iPtr]);
- AddLog(CEC_LOG_DEBUG, strLog);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "%s - device %d: type %d", __FUNCTION__, iPtr, m_types.types[iPtr]);
if (m_types.types[iPtr] == CEC_DEVICE_TYPE_RECORDING_DEVICE)
bReturn &= FindLogicalAddressRecordingDevice();
{
CLockObject lock(m_mutex);
m_bStarted = true;
- m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "processor thread started");
m_startCondition.Signal();
}
if (!m_bStarted && !bForce)
return true;
- CStdString strLog;
- strLog.Format("setting HDMI port to %d on device %s (%d)", iPort, ToString(iBaseDevice), (int)iBaseDevice);
- AddLog(CEC_LOG_DEBUG, strLog);
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "setting HDMI port to %d on device %s (%d)", iPort, ToString(iBaseDevice), (int)iBaseDevice);
uint16_t iPhysicalAddress(0);
if (iBaseDevice > CECDEVICE_TV)
}
if (!bReturn)
- m_controller->AddLog(CEC_LOG_ERROR, "failed to set the physical address");
+ CLibCEC::AddLog(CEC_LOG_ERROR, "failed to set the physical address");
else
{
lock.Unlock();
for (uint8_t iPtr = 0; iPtr < data.parameters.size; iPtr++)
strTx.AppendFormat(":%02x", data.parameters[iPtr]);
- m_controller->AddLog(CEC_LOG_TRAFFIC, strTx.c_str());
+ CLibCEC::AddLog(CEC_LOG_TRAFFIC, strTx.c_str());
}
bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress)
CLockObject lock(m_mutex);
if (m_logicalAddresses.primary != iLogicalAddress)
{
- CStdString strLog;
- strLog.Format("<< setting primary logical address to %1x", iLogicalAddress);
- m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "<< setting primary logical address to %1x", iLogicalAddress);
m_logicalAddresses.primary = iLogicalAddress;
m_logicalAddresses.Set(iLogicalAddress);
return SetAckMask(m_logicalAddresses.AckMask());
bool CCECProcessor::SwitchMonitoring(bool bEnable)
{
- CStdString strLog;
- strLog.Format("== %s monitoring mode ==", bEnable ? "enabling" : "disabling");
- m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
+ CLibCEC::AddLog(CEC_LOG_NOTICE, "== %s monitoring mode ==", bEnable ? "enabling" : "disabling");
{
CLockObject lock(m_mutex);
void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode, cec_abort_reason reason /* = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE */)
{
- m_controller->AddLog(CEC_LOG_DEBUG, "<< transmitting abort message");
+ CLibCEC::AddLog(CEC_LOG_DEBUG, "<< transmitting abort message");
cec_command command;
// TODO
break;
}
- m_controller->AddLog(bIsError ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
+ CLibCEC::AddLog(bIsError ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
return bEom;
}
dataStr.Format(">> %1x%1x:%02x", command.initiator, command.destination, command.opcode);
for (uint8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
dataStr.AppendFormat(":%02x", (unsigned int)command.parameters[iPtr]);
- m_controller->AddLog(CEC_LOG_TRAFFIC, dataStr.c_str());
+ CLibCEC::AddLog(CEC_LOG_TRAFFIC, dataStr.c_str());
if (!m_bMonitor && command.initiator >= CECDEVICE_TV && command.initiator <= CECDEVICE_BROADCAST)
m_busDevices[(uint8_t)command.initiator]->HandleCommand(command);
return false;
}
-void CCECProcessor::SetCurrentButton(cec_user_control_code iButtonCode)
-{
- m_controller->SetCurrentButton(iButtonCode);
-}
-
-void CCECProcessor::AddCommand(const cec_command &command)
-{
- m_controller->AddCommand(command);
-}
-
-void CCECProcessor::AddKey(cec_keypress &key)
-{
- m_controller->AddKey(key);
-}
-
-void CCECProcessor::AddKey(void)
-{
- m_controller->AddKey();
-}
-
-void CCECProcessor::AddLog(cec_log_level level, const CStdString &strMessage)
-{
- m_controller->AddLog(level, strMessage);
-}
-
bool CCECProcessor::SetAckMask(uint16_t iMask)
{
return m_communication->SetAckMask(iMask);
repositories / deb_libcec.git / blobdiff