Merge pull request #68 from AlwinEsch/Matrix-change

[Matrix] API related update
kodi-game · Sep 13, 2020 · 54f3089 · 54f3089
2 parents a8e6952 + dadb0d2
commit 54f3089
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,6 +26,11 @@ matrix:
       sudo: required
       compiler: gcc
       env: DEBIAN_BUILD=true
+    - os: linux
+      dist: focal
+      sudo: required
+      compiler: gcc
+      env: DEBIAN_BUILD=true
     - os: osx
       osx_image: xcode10.2
 

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="2.1.0"
+       version="2.2.0"
        provider-name="Team Kodi">
   <backwards-compatibility abi="1.0.0"/>
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/src/client.cpp b/src/client.cpp
@@ -329,7 +329,7 @@ void CGameLibRetro::FreeTopology(game_input_topology* topology)
   CControllerTopology::FreeTopology(topology);
 }
 
-void CGameLibRetro::SetControllerLayouts(const std::vector<AddonGameControllerLayout>& controllers)
+void CGameLibRetro::SetControllerLayouts(const std::vector<kodi::addon::GameControllerLayout>& controllers)
 {
   CInputManager::Get().SetControllerLayouts(controllers);
 }

diff --git a/src/client.h b/src/client.h
@@ -52,7 +52,7 @@ class ATTRIBUTE_HIDDEN CGameLibRetro
   bool HasFeature(const std::string& controller_id, const std::string& feature_name) override;
   game_input_topology* GetTopology() override;
   void FreeTopology(game_input_topology* topology) override;
-  void SetControllerLayouts(const std::vector<AddonGameControllerLayout>& controllers) override;
+  void SetControllerLayouts(const std::vector<kodi::addon::GameControllerLayout>& controllers) override;
   bool EnableKeyboard(bool enable, const std::string& controller_id) override;
   bool EnableMouse(bool enable, const std::string& controller_id) override;
   bool ConnectController(bool connect, const std::string& port_address, const std::string& controller_id) override;

diff --git a/src/input/ControllerLayout.cpp b/src/input/ControllerLayout.cpp
@@ -9,7 +9,7 @@
 
 using namespace LIBRETRO;
 
-CControllerLayout::CControllerLayout(const AddonGameControllerLayout& controller) :
+CControllerLayout::CControllerLayout(const kodi::addon::GameControllerLayout& controller) :
   m_controller(controller)
 {
 }
diff --git a/src/input/ControllerLayout.h b/src/input/ControllerLayout.h
@@ -19,12 +19,12 @@ namespace LIBRETRO
   class CControllerLayout
   {
   public:
-    CControllerLayout(const AddonGameControllerLayout& controller);
+    CControllerLayout(const kodi::addon::GameControllerLayout& controller);
 
     const std::string &ControllerID() const { return m_controller.controller_id; }
     bool ProvidesInput() const { return m_controller.provides_input; }
 
   private:
-    AddonGameControllerLayout m_controller;
+    kodi::addon::GameControllerLayout m_controller;
   };
 }
diff --git a/src/input/InputManager.cpp b/src/input/InputManager.cpp
@@ -39,7 +39,7 @@ libretro_device_caps_t CInputManager::GetDeviceCaps(void) const
 }
 
 
-void CInputManager::SetControllerLayouts(const std::vector<AddonGameControllerLayout>& controllers)
+void CInputManager::SetControllerLayouts(const std::vector<kodi::addon::GameControllerLayout>& controllers)
 {
   m_controllerLayouts.clear();
 

diff --git a/src/input/InputManager.h b/src/input/InputManager.h
@@ -45,7 +45,7 @@ namespace LIBRETRO
     /*!
      * \brief
      */
-    void SetControllerLayouts(const std::vector<AddonGameControllerLayout>& controllers);
+    void SetControllerLayouts(const std::vector<kodi::addon::GameControllerLayout>& controllers);
 
     /*!
      * \brief Enable the keyboard