win32: sync project files and fixed compilation warnings.

[deb_libcec.git] / src / lib / CECClient.cpp

diff --git a/src/lib/CECClient.cpp b/src/lib/CECClient.cpp
index 4cccb60e65ec6bec0f6396516c4cdbb6c23cbeac..9e69d0d7fef1527978ba341bf37ab2d654bf7ba1 100644 (file)
--- a/src/lib/CECClient.cpp
+++ b/src/lib/CECClient.cpp
@@ -733,8 +733,7 @@ bool CCECClient::SetConfiguration(const libcec_configuration *configuration)
   CCECBusDevice *primary = bIsRunning ? GetPrimaryDevice() : NULL;
   cec_device_type oldPrimaryType = primary ? primary->GetType() : CEC_DEVICE_TYPE_RECORDING_DEVICE;
 
-  m_configuration.serverVersion  = LIBCEC_VERSION_CURRENT;
-  m_configuration.clientVersion  = configuration->clientVersion;
+  m_configuration.clientVersion = configuration->clientVersion;
   LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s - using client version '%s'", __FUNCTION__, ToString((cec_client_version)configuration->clientVersion));
 
   // client version 1.5.0
@@ -871,7 +870,7 @@ bool CCECClient::SetConfiguration(const libcec_configuration *configuration)
   else if (m_configuration.bActivateSource == 1 && bIsRunning && !m_processor->IsActiveSource(m_configuration.logicalAddresses.primary))
   {
     // activate the source if we're not already the active source
-    m_processor->SetActiveSource(m_configuration.deviceTypes.types[0]);
+    SendSetActiveSource(m_configuration.deviceTypes.types[0]);
   }
 
   // persist the configuration