X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECProcessor.cpp;h=8ac48d47117d5c50478b7df1af0e10493df179fa;hb=7f274e7275090a3845a538cbcd42b4f107b27605;hp=2c3bf13b5562380bcc3a10291718b67814307233;hpb=dcb4b95e147360fc37765b2b591a710f0b982534;p=deb_libcec.git diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 2c3bf13..8ac48d4 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -188,12 +188,12 @@ bool CCECProcessor::OpenConnection(const char *strPort, uint16_t iBaudRate, uint if (bReturn) { m_configuration.iFirmwareVersion = m_communication->GetFirmwareVersion(); - uint32_t iBuildDate = m_communication->GetFirmwareBuildDate(); + m_configuration.iFirmwareBuildDate = m_communication->GetFirmwareBuildDate(); CStdString strLog; strLog.Format("connected to the CEC adapter. libCEC version = %s, client version = %s, firmware version = %d", ToString((cec_server_version)m_configuration.serverVersion), ToString((cec_client_version)m_configuration.clientVersion), m_configuration.iFirmwareVersion); - if (iBuildDate > 0) + if (m_configuration.iFirmwareBuildDate > 0) { - time_t buildTime = (time_t)iBuildDate; + time_t buildTime = (time_t)m_configuration.iFirmwareBuildDate; strLog.AppendFormat(", firmware build date: %s", asctime(gmtime(&buildTime))); strLog = strLog.Left(strLog.length() - 1); // strip \n added by asctime strLog.append(" +0000"); @@ -1661,7 +1661,7 @@ bool CCECProcessor::SetConfiguration(const libcec_configuration *configuration) // client version 1.6.2 if (configuration->clientVersion >= CEC_CLIENT_VERSION_1_6_2) { - snprintf(m_configuration.strDeviceLanguage, 3, "%s", configuration->strDeviceLanguage); + memcpy(m_configuration.strDeviceLanguage, configuration->strDeviceLanguage, 3); } // ensure that there is at least 1 device type set @@ -1727,6 +1727,12 @@ bool CCECProcessor::GetCurrentConfiguration(libcec_configuration *configuration) configuration->bShutdownOnStandby = m_configuration.bShutdownOnStandby; } + // client version 1.6.2 + if (configuration->clientVersion >= CEC_CLIENT_VERSION_1_6_2) + { + memcpy(configuration->strDeviceLanguage, m_configuration.strDeviceLanguage, 3); + configuration->iFirmwareBuildDate = m_configuration.iFirmwareBuildDate; + } return true; }