Merge pull request #82 from AlwinEsch/Nexus-change

[Nexus] API related update
kodi-game · Jan 1, 2022 · 1aa8266 · 1aa8266
2 parents 4659d75 + 74a1ece
commit 1aa8266
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 18 deletions.
diff --git a/game.libretro/addon.xml.in b/game.libretro/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="game.libretro"
        name="Libretro Compatibility"
-       version="20.0.2"
+       version="20.1.0"
        provider-name="Team Kodi">
   <backwards-compatibility abi="1.0.0"/>
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/src/audio/AudioStream.h b/src/audio/AudioStream.h
@@ -17,7 +17,7 @@ class CGameLibRetro;
 
 namespace LIBRETRO
 {
-  class ATTRIBUTE_HIDDEN CAudioStream
+  class ATTR_DLL_LOCAL CAudioStream
   {
   public:
     CAudioStream();

diff --git a/src/client.cpp b/src/client.cpp
@@ -132,18 +132,13 @@ ADDON_STATUS CGameLibRetro::Create()
     return status;
   }
 
-  return GetStatus();
-}
-
-ADDON_STATUS CGameLibRetro::GetStatus()
-{
   if (!CSettings::Get().IsInitialized())
     return ADDON_STATUS_NEED_SETTINGS;
 
   return ADDON_STATUS_OK;
 }
 
-ADDON_STATUS CGameLibRetro::SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue)
+ADDON_STATUS CGameLibRetro::SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue)
 {
   if (settingName == "" || settingValue.empty())
     return ADDON_STATUS_UNKNOWN;

diff --git a/src/client.h b/src/client.h
@@ -18,7 +18,7 @@ namespace LIBRETRO
   class CGameInfoLoader;
 }
 
-class ATTRIBUTE_HIDDEN CGameLibRetro
+class ATTR_DLL_LOCAL CGameLibRetro
   : public kodi::addon::CAddonBase,
     public kodi::addon::CInstanceGame
 {
@@ -27,8 +27,7 @@ class ATTRIBUTE_HIDDEN CGameLibRetro
   ~CGameLibRetro() override;
 
   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;
 
   // --- Game operations ---------------------------------------------------------
 

diff --git a/src/libretro/FrontendBridge.cpp b/src/libretro/FrontendBridge.cpp
@@ -32,7 +32,7 @@ using namespace LIBRETRO;
 
 void CFrontendBridge::LogFrontend(retro_log_level level, const char *fmt, ...)
 {
-  AddonLog xbmcLevel;
+  ADDON_LOG xbmcLevel;
   switch (level)
   {
   case RETRO_LOG_DEBUG: xbmcLevel = ADDON_LOG_DEBUG; break;

diff --git a/src/libretro/LibretroEnvironment.h b/src/libretro/LibretroEnvironment.h
@@ -26,7 +26,7 @@ namespace LIBRETRO
   class CClientBridge;
   class CLibretroDLL;
 
-  class ATTRIBUTE_HIDDEN CLibretroEnvironment
+  class ATTR_DLL_LOCAL CLibretroEnvironment
   {
   public:
     static CLibretroEnvironment& Get(void);

diff --git a/src/log/LogAddon.cpp b/src/log/LogAddon.cpp
@@ -16,7 +16,7 @@ using namespace LIBRETRO;
 
 // --- TranslateLogLevel() -----------------------------------------------------
 
-AddonLog TranslateLogLevel(SYS_LOG_LEVEL level)
+ADDON_LOG TranslateLogLevel(SYS_LOG_LEVEL level)
 {
   switch (level)
   {

diff --git a/src/settings/LibretroSettings.cpp b/src/settings/LibretroSettings.cpp
@@ -73,7 +73,7 @@ void CLibretroSettings::SetAllSettings(const retro_variable* libretroVariables)
 
       // Query current value for setting from the frontend
       std::string valueBuf;
-      if (kodi::CheckSettingString(variable->key, valueBuf))
+      if (kodi::addon::CheckSettingString(variable->key, valueBuf))
       {
         if (std::find(setting.Values().begin(), setting.Values().end(), valueBuf) != setting.Values().end())
         {

diff --git a/src/settings/Settings.cpp b/src/settings/Settings.cpp
@@ -23,7 +23,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_CROP_OVERSCAN)
   {

diff --git a/src/settings/Settings.h b/src/settings/Settings.h
@@ -22,7 +22,7 @@ namespace LIBRETRO
 
     bool IsInitialized(void) const { return m_bInitialized; }
 
-    void SetSetting(const std::string& strName, const kodi::CSettingValue& value);
+    void SetSetting(const std::string& strName, const kodi::addon::CSettingValue& value);
 
     /*!
      * \brief True if the libretro core should crop overscan

diff --git a/src/video/VideoStream.h b/src/video/VideoStream.h
@@ -18,7 +18,7 @@ namespace LIBRETRO
 {
   class CVideoGeometry;
 
-  class ATTRIBUTE_HIDDEN CVideoStream
+  class ATTR_DLL_LOCAL CVideoStream
   {
   public:
     CVideoStream();