API related update

Author: AlwinEsch

lib/libdstdec/common.h

@@ -12,7 +12,7 @@
 namespace
 {
 
-inline const char* kodiTranslateLogLevel(const AddonLog logLevel)
+inline const char* kodiTranslateLogLevel(const ADDON_LOG logLevel)
 {
   switch (logLevel)
   {
@@ -32,7 +32,7 @@ inline const char* kodiTranslateLogLevel(const AddonLog logLevel)
   return "LOG_UNKNOWN: ";
 }
 
-inline void kodiLog(const AddonLog logLevel, const char* format, ...)
+inline void kodiLog(const ADDON_LOG logLevel, const char* format, ...)
 {
   char buffer[16384];
   va_list args;

src/Addon.cpp

@@ -15,23 +15,20 @@ CMyAddon::CMyAddon()
   CSACDSettings::GetInstance().Load();
 }
 
-ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
-                                      const std::string& instanceID,
-                                      KODI_HANDLE instance,
-                                      const std::string& version,
-                                      KODI_HANDLE& addonInstance)
+ADDON_STATUS CMyAddon::CreateInstance(const kodi::addon::IInstanceInfo& instance,
+                                      KODI_ADDON_INSTANCE_HDL& hdl)
 {
-  if (instanceType == ADDON_INSTANCE_AUDIODECODER)
+  if (instance.IsType(ADDON_INSTANCE_AUDIODECODER))
   {
-    addonInstance = new CSACDAudioDecoder(instance, version);
+    hdl = new CSACDAudioDecoder(instance);
     return ADDON_STATUS_OK;
   }
 
   return ADDON_STATUS_UNKNOWN;
 }
 
 ADDON_STATUS CMyAddon::SetSetting(const std::string& settingName,
-                                  const kodi::CSettingValue& settingValue)
+                                  const kodi::addon::CSettingValue& settingValue)
 {
   return CSACDSettings::GetInstance().SetSetting(settingName, settingValue) ? ADDON_STATUS_OK
                                                                             : ADDON_STATUS_UNKNOWN;

src/Addon.h

@@ -15,12 +15,9 @@ class ATTR_DLL_LOCAL CMyAddon : public kodi::addon::CAddonBase
   CMyAddon();
   ~CMyAddon() override = default;
 
-  ADDON_STATUS CreateInstance(int instanceType,
-                              const std::string& instanceID,
-                              KODI_HANDLE instance,
-                              const std::string& version,
-                              KODI_HANDLE& addonInstance) override;
+  ADDON_STATUS CreateInstance(const kodi::addon::IInstanceInfo& instance,
+                              KODI_ADDON_INSTANCE_HDL& hdl) override;
 
   ADDON_STATUS SetSetting(const std::string& settingName,
-                          const kodi::CSettingValue& settingValue) override;
+                          const kodi::addon::CSettingValue& settingValue) override;
 };

src/SACDAudio.cpp

@@ -26,10 +26,10 @@ std::string getFileExt(const std::string& s)
   return ("");
 }
 
-}
+} // namespace
 
-CSACDAudioDecoder::CSACDAudioDecoder(KODI_HANDLE instance, const std::string& version)
-  : CInstanceAudioDecoder(instance, version)
+CSACDAudioDecoder::CSACDAudioDecoder(const kodi::addon::IInstanceInfo& instance)
+  : CInstanceAudioDecoder(instance)
 {
 }
 
@@ -110,7 +110,7 @@ bool CSACDAudioDecoder::Init(const std::string& filename,
   if (CSACDSettings::GetInstance().GetConverterType() == conv_type_e::USER)
   {
     std::string path = CSACDSettings::GetInstance().GetConverterFirFile();
-    if (!path.empty() && LoadFir(kodi::GetAddonPath(path)))
+    if (!path.empty() && LoadFir(kodi::addon::GetAddonPath(path)))
     {
       fir_data = m_firData.data();
       fir_size = m_firData.size();

src/SACDAudio.h

@@ -23,7 +23,7 @@ class ATTR_DLL_LOCAL CSACDAudioDecoder : public kodi::addon::CInstanceAudioDecod
                                          public sacd_core_t
 {
 public:
-  CSACDAudioDecoder(KODI_HANDLE instance, const std::string& version);
+  CSACDAudioDecoder(const kodi::addon::IInstanceInfo& instance);
   virtual ~CSACDAudioDecoder() = default;
 
   bool SupportsFile(const std::string& filename) override;

src/Settings.cpp

@@ -11,20 +11,20 @@
 
 bool CSACDSettings::Load()
 {
-  m_volumeAdjust = kodi::GetSettingFloat("volume-adjust", 0.0f);
-  m_lfeAdjust = pow(10.0f, kodi::GetSettingFloat("lfe-adjust", 0.0f) / 20.0f);
-  m_samplerate = kodi::GetSettingInt("samplerate", 352800);
-  m_dsd2pcmMode = kodi::GetSettingInt("dsd2pcm-mode", 0);
-  m_dsd2pcmFirFile = kodi::GetSettingString("firconverter", "");
-  m_speakerArea = kodi::GetSettingInt("area", 0);
-  m_separateMultichannel = kodi::GetSettingBoolean("separate-multichannel", false);
-  m_separateMultichannel = kodi::GetSettingBoolean("area-allow-fallback", true);
+  m_volumeAdjust = kodi::addon::GetSettingFloat("volume-adjust", 0.0f);
+  m_lfeAdjust = pow(10.0f, kodi::addon::GetSettingFloat("lfe-adjust", 0.0f) / 20.0f);
+  m_samplerate = kodi::addon::GetSettingInt("samplerate", 352800);
+  m_dsd2pcmMode = kodi::addon::GetSettingInt("dsd2pcm-mode", 0);
+  m_dsd2pcmFirFile = kodi::addon::GetSettingString("firconverter", "");
+  m_speakerArea = kodi::addon::GetSettingInt("area", 0);
+  m_separateMultichannel = kodi::addon::GetSettingBoolean("separate-multichannel", false);
+  m_separateMultichannel = kodi::addon::GetSettingBoolean("area-allow-fallback", true);
 
   return true;
 }
 
 bool CSACDSettings::SetSetting(const std::string& settingName,
-                               const kodi::CSettingValue& settingValue)
+                               const kodi::addon::CSettingValue& settingValue)
 {
   if (settingName == "volume-adjust")
   {

src/Settings.h

@@ -21,7 +21,7 @@ class CSACDSettings
   }
 
   bool Load();
-  bool SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue);
+  bool SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue);
 
   float GetVolumeAdjust() const { return m_volumeAdjust; }
   float GetLFEAdjust() const { return m_lfeAdjust; }