From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 11 May 2012 08:09:44 +0000 (+0200)
Subject: win32: sync project files and fixed compilation warnings.
X-Git-Tag: upstream/2.2.0~1^2~28^2~23
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=205057410e723e23ab0f4ac910c497b3ecd319bd;p=deb_libcec.git

win32: sync project files and fixed compilation warnings.
---

diff --git a/project/libcec.vcxproj b/project/libcec.vcxproj
index aed370c..a5beb9f 100644
--- a/project/libcec.vcxproj
+++ b/project/libcec.vcxproj
@@ -29,9 +29,12 @@
     <ClInclude Include="..\src\lib\adapter\USBCECAdapterDetection.h" />
     <ClInclude Include="..\src\lib\adapter\USBCECAdapterMessage.h" />
     <ClInclude Include="..\src\lib\adapter\USBCECAdapterMessageQueue.h" />
+    <ClInclude Include="..\src\lib\CECClient.h" />
+    <ClInclude Include="..\src\lib\CECInputBuffer.h" />
     <ClInclude Include="..\src\lib\CECProcessor.h" />
     <ClInclude Include="..\src\lib\devices\CECAudioSystem.h" />
     <ClInclude Include="..\src\lib\devices\CECBusDevice.h" />
+    <ClInclude Include="..\src\lib\devices\CECDeviceMap.h" />
     <ClInclude Include="..\src\lib\devices\CECPlaybackDevice.h" />
     <ClInclude Include="..\src\lib\devices\CECRecordingDevice.h" />
     <ClInclude Include="..\src\lib\devices\CECTuner.h" />
@@ -63,9 +66,11 @@
     <ClCompile Include="..\src\lib\adapter\USBCECAdapterDetection.cpp" />
     <ClCompile Include="..\src\lib\adapter\USBCECAdapterMessage.cpp" />
     <ClCompile Include="..\src\lib\adapter\USBCECAdapterMessageQueue.cpp" />
+    <ClCompile Include="..\src\lib\CECClient.cpp" />
     <ClCompile Include="..\src\lib\CECProcessor.cpp" />
     <ClCompile Include="..\src\lib\devices\CECAudioSystem.cpp" />
     <ClCompile Include="..\src\lib\devices\CECBusDevice.cpp" />
+    <ClCompile Include="..\src\lib\devices\CECDeviceMap.cpp" />
     <ClCompile Include="..\src\lib\devices\CECPlaybackDevice.cpp" />
     <ClCompile Include="..\src\lib\devices\CECRecordingDevice.cpp" />
     <ClCompile Include="..\src\lib\devices\CECTuner.cpp" />
diff --git a/project/libcec.vcxproj.filters b/project/libcec.vcxproj.filters
index fdd9df3..f1205a5 100644
--- a/project/libcec.vcxproj.filters
+++ b/project/libcec.vcxproj.filters
@@ -137,6 +137,11 @@
     <ClInclude Include="..\src\lib\adapter\USBCECAdapterMessageQueue.h">
       <Filter>adapter</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\lib\CECClient.h" />
+    <ClInclude Include="..\src\lib\CECInputBuffer.h" />
+    <ClInclude Include="..\src\lib\devices\CECDeviceMap.h">
+      <Filter>devices</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\lib\CECProcessor.cpp" />
@@ -197,6 +202,10 @@
     <ClCompile Include="..\src\lib\adapter\USBCECAdapterMessageQueue.cpp">
       <Filter>adapter</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\lib\CECClient.cpp" />
+    <ClCompile Include="..\src\lib\devices\CECDeviceMap.cpp">
+      <Filter>devices</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="libcec.rc" />
diff --git a/src/lib/CECClient.cpp b/src/lib/CECClient.cpp
index 30723fe..9e69d0d 100644
--- a/src/lib/CECClient.cpp
+++ b/src/lib/CECClient.cpp
@@ -870,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
diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index a204a4b..1646041 100644
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -338,6 +338,9 @@ bool CLibCEC::SendKeyRelease(cec_logical_address iDestination, bool bWait /* = t
 cec_osd_name CLibCEC::GetDeviceOSDName(cec_logical_address iAddress)
 {
   cec_osd_name retVal;
+  retVal.device = CECDEVICE_UNKNOWN;
+  memset(retVal.name, 0, 14);
+
   if (m_client)
     retVal = m_client->GetDeviceOSDName(iAddress);
   return retVal;
diff --git a/src/lib/devices/CECDeviceMap.cpp b/src/lib/devices/CECDeviceMap.cpp
index 5580527..3c70603 100644
--- a/src/lib/devices/CECDeviceMap.cpp
+++ b/src/lib/devices/CECDeviceMap.cpp
@@ -36,7 +36,7 @@
 #include "CECRecordingDevice.h"
 #include "CECTuner.h"
 #include "CECTV.h"
-#include "CECProcessor.h"
+#include "../CECProcessor.h"
 
 using namespace std;
 using namespace CEC;
@@ -185,7 +185,7 @@ void CCECDeviceMap::GetPowerOffDevices(const libcec_configuration &configuration
 {
   for (CECDEVICEMAP::const_iterator it = m_busDevices.begin(); it != m_busDevices.end(); it++)
   {
-    if (configuration.powerOffDevices[it->first])
+    if (configuration.powerOffDevices[(uint8_t)it->first])
       devices.push_back(it->second);
   }
 }
@@ -194,7 +194,7 @@ void CCECDeviceMap::GetWakeDevices(const libcec_configuration &configuration, CE
 {
   for (CECDEVICEMAP::const_iterator it = m_busDevices.begin(); it != m_busDevices.end(); it++)
   {
-    if (configuration.wakeDevices[it->first])
+    if (configuration.wakeDevices[(uint8_t)it->first])
       devices.push_back(it->second);
   }
 }