X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fdevices%2FCECDeviceMap.cpp;h=a21b2b43254149cf51408d43c90365a81bbe6a4a;hb=fce3d4acbadffe3dacbf3d49a77f685ef8e82c02;hp=2603e33d2de82fb22b37a71bcb880fc2f8754da9;hpb=004b83822a351e1fb6e982a9183a12a430b0b769;p=deb_libcec.git

diff --git a/src/lib/devices/CECDeviceMap.cpp b/src/lib/devices/CECDeviceMap.cpp
index 2603e33..a21b2b4 100644
--- a/src/lib/devices/CECDeviceMap.cpp
+++ b/src/lib/devices/CECDeviceMap.cpp
@@ -30,13 +30,15 @@
  *     http://www.pulse-eight.net/
  */
 
+#include "env.h"
 #include "CECDeviceMap.h"
+
 #include "CECAudioSystem.h"
 #include "CECPlaybackDevice.h"
 #include "CECRecordingDevice.h"
 #include "CECTuner.h"
 #include "CECTV.h"
-#include "CECProcessor.h"
+#include "lib/CECProcessor.h"
 
 using namespace std;
 using namespace CEC;
@@ -185,7 +187,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 +196,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);
   }
 }
@@ -235,10 +237,11 @@ void CCECDeviceMap::FilterActive(CECDEVICEVEC &devices)
 
 void CCECDeviceMap::FilterTypes(const cec_device_type_list &types, CECDEVICEVEC &devices)
 {
+  cec_device_type_list t(types);//silly, but needed to retain abi
   CECDEVICEVEC newDevices;
   for (CECDEVICEVEC::const_iterator it = devices.begin(); it != devices.end(); it++)
   {
-    if (types.IsSet((*it)->GetType()))
+    if (t.IsSet((*it)->GetType()))
       newDevices.push_back(*it);
   }
   devices = newDevices;
@@ -258,6 +261,7 @@ void CCECDeviceMap::FilterType(const cec_device_type type, CECDEVICEVEC &devices
 cec_logical_addresses CCECDeviceMap::ToLogicalAddresses(const CECDEVICEVEC &devices)
 {
   cec_logical_addresses addresses;
+  addresses.Clear();
   for (CECDEVICEVEC::const_iterator it = devices.begin(); it != devices.end(); it++)
     addresses.Set((*it)->GetLogicalAddress());
   return addresses;