API related update

xbmc · Jan 1, 2022 · b43faa6 · b43faa6
1 parent 6f824a8
commit b43faa6
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 20 deletions.
diff --git a/src/addon.cpp b/src/addon.cpp
@@ -47,21 +47,12 @@ ADDON_STATUS CPeripheralJoystick::Create()
   return ADDON_STATUS_NEED_SETTINGS;
 }
 
-ADDON_STATUS CPeripheralJoystick::SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue)
+ADDON_STATUS CPeripheralJoystick::SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue)
 {
   CSettings::Get().SetSetting(settingName, settingValue);
   return ADDON_STATUS_OK;
 }
 
-
-ADDON_STATUS CPeripheralJoystick::GetStatus()
-{
-  if (!CSettings::Get().IsInitialized())
-    return ADDON_STATUS_NEED_SETTINGS;
-
-  return ADDON_STATUS_OK;
-}
-
 CPeripheralJoystick::~CPeripheralJoystick()
 {
   CStorageManager::Get().Deinitialize();

diff --git a/src/addon.h b/src/addon.h
@@ -26,8 +26,7 @@ class DLL_PRIVATE CPeripheralJoystick
   virtual ~CPeripheralJoystick();
 
   ADDON_STATUS Create() override;
-  ADDON_STATUS GetStatus() override;
-  ADDON_STATUS SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue) override;
+  ADDON_STATUS SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue) override;
 
   void GetCapabilities(kodi::addon::PeripheralCapabilities& capabilities) override;
   PERIPHERAL_ERROR PerformDeviceScan(std::vector<std::shared_ptr<kodi::addon::Peripheral>>& scan_results) override;

diff --git a/src/filesystem/DirectoryCache.h b/src/filesystem/DirectoryCache.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "utils/CommonMacros.h"
+
 #include <kodi/Filesystem.h>
 
 #include <chrono>
@@ -27,7 +29,7 @@ namespace JOYSTICK
     virtual void OnRemove(const kodi::vfs::CDirEntry& item) = 0;
   };
 
-  class CDirectoryCache
+  class DLL_PRIVATE CDirectoryCache
   {
   public:
     void Initialize(IDirectoryCacheCallback* callbacks);

diff --git a/src/log/LogAddon.cpp b/src/log/LogAddon.cpp
@@ -20,7 +20,7 @@ CLogAddon::CLogAddon()
 
 void CLogAddon::Log(SYS_LOG_LEVEL level, const char* logline)
 {
-  AddonLog loglevel;
+  ADDON_LOG loglevel;
 
   switch (level)
   {

diff --git a/src/settings/Settings.cpp b/src/settings/Settings.cpp
@@ -33,7 +33,7 @@ CSettings& CSettings::Get(void)
   return _instance;
 }
 
-void CSettings::SetSetting(const std::string& strName, const kodi::CSettingValue& value)
+void CSettings::SetSetting(const std::string& strName, const kodi::addon::CSettingValue& value)
 {
   if (strName == SETTING_RETROARCH_CONFIG)
   {

diff --git a/src/settings/Settings.h b/src/settings/Settings.h
@@ -24,7 +24,7 @@ namespace JOYSTICK
     /*!
      * \brief Set the value of a setting. Called by the frontend.
      */
-    void SetSetting(const std::string& strName, const kodi::CSettingValue& value);
+    void SetSetting(const std::string& strName, const kodi::addon::CSettingValue& value);
 
     /*!
      * \brief Check if the settings have been initialized

diff --git a/src/storage/JustABunchOfFiles.h b/src/storage/JustABunchOfFiles.h
@@ -25,7 +25,7 @@ namespace JOYSTICK
   /*!
    * \brief Container class for device records and button maps
    */
-  class CResources
+  class DLL_PRIVATE CResources
   {
   public:
     CResources(const CJustABunchOfFiles* database);
@@ -55,8 +55,8 @@ namespace JOYSTICK
     ResourceMap m_resources;
   };
 
-  class CJustABunchOfFiles : public IDatabase,
-                             public IDirectoryCacheCallback
+  class DLL_PRIVATE CJustABunchOfFiles : public IDatabase,
+                                         public IDirectoryCacheCallback
   {
   public:
     CJustABunchOfFiles(const std::string& strResourcePath,

diff --git a/src/storage/xml/DatabaseXml.h b/src/storage/xml/DatabaseXml.h
@@ -19,7 +19,7 @@ namespace JOYSTICK
 {
   class IControllerHelper;
 
-  class CDatabaseXml : public CJustABunchOfFiles
+  class DLL_PRIVATE CDatabaseXml : public CJustABunchOfFiles
   {
   public:
     CDatabaseXml(const std::string& strBasePath, bool bReadWrite, IDatabaseCallbacks* callbacks, IControllerHelper *controllerHelper);