X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fadapter%2FUSBCECAdapterCommands.cpp;h=6642ac838567a35dd0b0fc86cd0e3aa27028c968;hb=d78e4e6f492d94f613dd4577b9fedc53c5a53a0d;hp=62a011a6279b74345e7001967ac7bae432371d2e;hpb=004b83822a351e1fb6e982a9183a12a430b0b769;p=deb_libcec.git

diff --git a/src/lib/adapter/USBCECAdapterCommands.cpp b/src/lib/adapter/USBCECAdapterCommands.cpp
index 62a011a..6642ac8 100644
--- a/src/lib/adapter/USBCECAdapterCommands.cpp
+++ b/src/lib/adapter/USBCECAdapterCommands.cpp
@@ -33,12 +33,13 @@
 #include "USBCECAdapterCommands.h"
 #include "../LibCEC.h"
 #include "../CECProcessor.h"
+#include "../CECTypeUtils.h"
 
 using namespace CEC;
 using namespace PLATFORM;
 
 #define LIB_CEC     m_comm->m_callback->GetLib()
-#define ToString(p) LIB_CEC->ToString(p)
+#define ToString(p) CCECTypeUtils::ToString(p)
 
 CUSBCECAdapterCommands::CUSBCECAdapterCommands(CUSBCECAdapterCommunication *comm) :
     m_comm(comm),
@@ -65,6 +66,7 @@ cec_datapacket CUSBCECAdapterCommands::RequestSetting(cec_adapter_messagecode ms
     retVal.Shift(2); // shift out start and msgcode
     retVal.size -= 1; // remove end
   }
+
   delete message;
   return retVal;
 }
@@ -413,7 +415,7 @@ bool CUSBCECAdapterCommands::WriteEEPROM(void)
   return m_bNeedsWrite;
 }
 
-bool CUSBCECAdapterCommands::PersistConfiguration(libcec_configuration *configuration)
+bool CUSBCECAdapterCommands::PersistConfiguration(const libcec_configuration &configuration)
 {
   if (m_persistedConfiguration.iFirmwareVersion < 2)
     return false;
@@ -423,12 +425,12 @@ bool CUSBCECAdapterCommands::PersistConfiguration(libcec_configuration *configur
 
   bool bReturn(true);
   bReturn &= SetSettingAutoEnabled(true);
-  bReturn &= SetSettingDeviceType(CLibCEC::GetType(configuration->logicalAddresses.primary));
-  bReturn &= SetSettingDefaultLogicalAddress(configuration->logicalAddresses.primary);
-  bReturn &= SetSettingLogicalAddressMask(CLibCEC::GetMaskForType(configuration->logicalAddresses.primary));
-  bReturn &= SetSettingPhysicalAddress(configuration->iPhysicalAddress);
+  bReturn &= SetSettingDeviceType(CLibCEC::GetType(configuration.logicalAddresses.primary));
+  bReturn &= SetSettingDefaultLogicalAddress(configuration.logicalAddresses.primary);
+  bReturn &= SetSettingLogicalAddressMask(CLibCEC::GetMaskForType(configuration.logicalAddresses.primary));
+  bReturn &= SetSettingPhysicalAddress(configuration.iPhysicalAddress);
   bReturn &= SetSettingCECVersion(CEC_VERSION_1_3A);
-  bReturn &= SetSettingOSDName(configuration->strDeviceName);
+  bReturn &= SetSettingOSDName(configuration.strDeviceName);
   bReturn &= WriteEEPROM();
   return bReturn;
 }
@@ -477,17 +479,17 @@ bool CUSBCECAdapterCommands::RequestSettings(void)
   return bReturn;
 }
 
-bool CUSBCECAdapterCommands::GetConfiguration(libcec_configuration *configuration)
+bool CUSBCECAdapterCommands::GetConfiguration(libcec_configuration &configuration)
 {
   // get the settings from the eeprom if needed
   if (!RequestSettings())
     return false;
 
   // copy the settings
-  configuration->iFirmwareVersion = m_persistedConfiguration.iFirmwareVersion;
-  configuration->deviceTypes      = m_persistedConfiguration.deviceTypes;
-  configuration->iPhysicalAddress = m_persistedConfiguration.iPhysicalAddress;
-  snprintf(configuration->strDeviceName, 13, "%s", m_persistedConfiguration.strDeviceName);
+  configuration.iFirmwareVersion = m_persistedConfiguration.iFirmwareVersion;
+  configuration.deviceTypes      = m_persistedConfiguration.deviceTypes;
+  configuration.iPhysicalAddress = m_persistedConfiguration.iPhysicalAddress;
+  snprintf(configuration.strDeviceName, 13, "%s", m_persistedConfiguration.strDeviceName);
 
   return true;
 }