Merge pull request #186 from AlwinEsch/Matrix-change

[Matrix] API related update

Author: AlwinEsch

peripheral.joystick/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="peripheral.joystick"
-  version="1.6.1"
+  version="1.7.0"
   name="Joystick Support"
   provider-name="Team Kodi">
   <requires>@ADDON_DEPENDS@</requires>

src/addon.cpp

@@ -73,193 +73,100 @@ CPeripheralJoystick::~CPeripheralJoystick()
   delete m_scanner;
 }
 
-void CPeripheralJoystick::GetCapabilities(PERIPHERAL_CAPABILITIES& capabilities)
+void CPeripheralJoystick::GetCapabilities(kodi::addon::PeripheralCapabilities& capabilities)
 {
-  capabilities.provides_joysticks = true;
-  capabilities.provides_buttonmaps = true;
+  capabilities.SetProvidesJoysticks(true);
+  capabilities.SetProvidesButtonmaps(true);
 }
 
-PERIPHERAL_ERROR CPeripheralJoystick::PerformDeviceScan(unsigned int* peripheral_count, PERIPHERAL_INFO** scan_results)
+PERIPHERAL_ERROR CPeripheralJoystick::PerformDeviceScan(std::vector<std::shared_ptr<kodi::addon::Peripheral>>& scan_results)
 {
-  if (!peripheral_count || !scan_results)
-    return PERIPHERAL_ERROR_INVALID_PARAMETERS;
-
   JoystickVector joysticks;
   if (!CJoystickManager::Get().PerformJoystickScan(joysticks))
     return PERIPHERAL_ERROR_FAILED;
 
   // Upcast array pointers
-  std::vector<kodi::addon::Peripheral*> peripherals;
-  for (JoystickVector::const_iterator it = joysticks.begin(); it != joysticks.end(); ++it)
-    peripherals.push_back(it->get());
-
-  *peripheral_count = static_cast<unsigned int>(peripherals.size());
-  kodi::addon::Peripherals::ToStructs(peripherals, scan_results);
+  for (const auto& it : joysticks)
+    scan_results.emplace_back(it);
 
   return PERIPHERAL_NO_ERROR;
 }
 
-void CPeripheralJoystick::FreeScanResults(unsigned int peripheral_count, PERIPHERAL_INFO* scan_results)
-{
-  kodi::addon::Peripherals::FreeStructs(peripheral_count, scan_results);
-}
-
-PERIPHERAL_ERROR CPeripheralJoystick::GetEvents(unsigned int* event_count, PERIPHERAL_EVENT** events)
+PERIPHERAL_ERROR CPeripheralJoystick::GetEvents(std::vector<kodi::addon::PeripheralEvent>& events)
 {
-  if (!event_count || !events)
-    return PERIPHERAL_ERROR_INVALID_PARAMETERS;
-
   PERIPHERAL_ERROR result = PERIPHERAL_ERROR_FAILED;
 
-  std::vector<kodi::addon::PeripheralEvent> peripheralEvents;
-  if (CJoystickManager::Get().GetEvents(peripheralEvents))
-  {
-    *event_count = static_cast<unsigned int>(peripheralEvents.size());
-    kodi::addon::PeripheralEvents::ToStructs(peripheralEvents, events);
+  if (CJoystickManager::Get().GetEvents(events))
     result = PERIPHERAL_NO_ERROR;
-  }
 
   CJoystickManager::Get().ProcessEvents();
 
   return result;
 }
 
-void CPeripheralJoystick::FreeEvents(unsigned int event_count, PERIPHERAL_EVENT* events)
+bool CPeripheralJoystick::SendEvent(const kodi::addon::PeripheralEvent& event)
 {
-  kodi::addon::PeripheralEvents::FreeStructs(event_count, events);
-}
-
-bool CPeripheralJoystick::SendEvent(const PERIPHERAL_EVENT* event)
-{
-  bool bHandled = false;
-
-  if (event != nullptr)
-    bHandled = CJoystickManager::Get().SendEvent(kodi::addon::PeripheralEvent(*event));
-
-  return bHandled;
+  return CJoystickManager::Get().SendEvent(event);
 }
 
-PERIPHERAL_ERROR CPeripheralJoystick::GetJoystickInfo(unsigned int index, JOYSTICK_INFO* info)
+PERIPHERAL_ERROR CPeripheralJoystick::GetJoystickInfo(unsigned int index, kodi::addon::Joystick& info)
 {
-  if (!info)
-    return PERIPHERAL_ERROR_INVALID_PARAMETERS;
-
   JoystickPtr joystick = CJoystickManager::Get().GetJoystick(index);
   if (!joystick)
     return PERIPHERAL_ERROR_NOT_CONNECTED;
 
-  // Need to be explicit because we're using typedef struct { ... }T instead of struct T{ ... }
-  joystick->kodi::addon::Joystick::ToStruct(*info);
+  info = *joystick;
 
   return PERIPHERAL_NO_ERROR;
 }
 
-void CPeripheralJoystick::FreeJoystickInfo(JOYSTICK_INFO* info)
-{
-  if (!info)
-    return;
-
-  kodi::addon::Joystick::FreeStruct(*info);
-}
-
-PERIPHERAL_ERROR CPeripheralJoystick::GetFeatures(const JOYSTICK_INFO* joystick, const char* controller_id,
-                                                  unsigned int* feature_count, JOYSTICK_FEATURE** features)
+PERIPHERAL_ERROR CPeripheralJoystick::GetFeatures(const kodi::addon::Joystick& joystick,
+                                                  const std::string& controller_id,
+                                                  std::vector<kodi::addon::JoystickFeature>& features)
 {
-  if (!joystick || !controller_id || !feature_count || !features)
-    return PERIPHERAL_ERROR_INVALID_PARAMETERS;
-
-  FeatureVector featureVector;
-  CStorageManager::Get().GetFeatures(kodi::addon::Joystick(*joystick), controller_id,  featureVector);
-
-  *feature_count = static_cast<unsigned int>(featureVector.size());
-  kodi::addon::JoystickFeatures::ToStructs(featureVector, features);
+  CStorageManager::Get().GetFeatures(joystick, controller_id, features);
 
   return PERIPHERAL_NO_ERROR;
 }
 
-void CPeripheralJoystick::FreeFeatures(unsigned int feature_count, JOYSTICK_FEATURE* features)
-{
-  kodi::addon::JoystickFeatures::FreeStructs(feature_count, features);
-}
-
-PERIPHERAL_ERROR CPeripheralJoystick::MapFeatures(const JOYSTICK_INFO* joystick, const char* controller_id,
-                             unsigned int feature_count, const JOYSTICK_FEATURE* features)
+PERIPHERAL_ERROR CPeripheralJoystick::MapFeatures(const kodi::addon::Joystick& joystick,
+                                                  const std::string& controller_id,
+                                                  const std::vector<kodi::addon::JoystickFeature>& features)
 {
-  if (!joystick || !controller_id || (feature_count > 0 && !features))
-    return PERIPHERAL_ERROR_INVALID_PARAMETERS;
-
-  FeatureVector featureVector(features, features + feature_count);
-  bool bSuccess = CStorageManager::Get().MapFeatures(kodi::addon::Joystick(*joystick), controller_id, featureVector);
+  bool bSuccess = CStorageManager::Get().MapFeatures(joystick, controller_id, features);
 
   return bSuccess ? PERIPHERAL_NO_ERROR : PERIPHERAL_ERROR_FAILED;
 }
 
-PERIPHERAL_ERROR CPeripheralJoystick::GetIgnoredPrimitives(const JOYSTICK_INFO* joystick,
-                                      unsigned int* primitive_count,
-                                      JOYSTICK_DRIVER_PRIMITIVE** primitives)
+PERIPHERAL_ERROR CPeripheralJoystick::GetIgnoredPrimitives(const kodi::addon::Joystick& joystick,
+                                                           std::vector<kodi::addon::DriverPrimitive>& primitives)
 {
-  if (joystick == nullptr || primitive_count == nullptr || primitives == nullptr)
-    return PERIPHERAL_ERROR_INVALID_PARAMETERS;
-
-  PrimitiveVector primitiveVector;
-  CStorageManager::Get().GetIgnoredPrimitives(kodi::addon::Joystick(*joystick), primitiveVector);
-
-  *primitive_count = static_cast<unsigned int>(primitiveVector.size());
-  kodi::addon::DriverPrimitives::ToStructs(primitiveVector, primitives);
+  CStorageManager::Get().GetIgnoredPrimitives(joystick, primitives);
 
   return PERIPHERAL_NO_ERROR;
 }
 
-void CPeripheralJoystick::FreePrimitives(unsigned int primitive_count, JOYSTICK_DRIVER_PRIMITIVE* primitives)
+PERIPHERAL_ERROR CPeripheralJoystick::SetIgnoredPrimitives(const kodi::addon::Joystick& joystick,
+                                                           const std::vector<kodi::addon::DriverPrimitive>& primitives)
 {
-  kodi::addon::DriverPrimitives::FreeStructs(primitive_count, primitives);
-}
-
-PERIPHERAL_ERROR CPeripheralJoystick::SetIgnoredPrimitives(const JOYSTICK_INFO* joystick,
-                                      unsigned int primitive_count,
-                                      const JOYSTICK_DRIVER_PRIMITIVE* primitives)
-{
-  if (joystick == nullptr || (primitive_count > 0 && primitives == nullptr))
-    return PERIPHERAL_ERROR_INVALID_PARAMETERS;
-
-  PrimitiveVector primitiveVector;
-
-  for (unsigned int i = 0; i < primitive_count; i++)
-    primitiveVector.emplace_back(*(primitives + i));
-
-  bool bSuccess = CStorageManager::Get().SetIgnoredPrimitives(kodi::addon::Joystick(*joystick), primitiveVector);
+  bool bSuccess = CStorageManager::Get().SetIgnoredPrimitives(joystick, primitives);
 
   return bSuccess ? PERIPHERAL_NO_ERROR : PERIPHERAL_ERROR_FAILED;
 }
 
-void CPeripheralJoystick::SaveButtonMap(const JOYSTICK_INFO* joystick)
+void CPeripheralJoystick::SaveButtonMap(const kodi::addon::Joystick& joystick)
 {
-  if (joystick == nullptr)
-    return;
-
-  kodi::addon::Joystick addonJoystick(*joystick);
-
-  CStorageManager::Get().SaveButtonMap(addonJoystick);
+  CStorageManager::Get().SaveButtonMap(joystick);
 }
 
-void CPeripheralJoystick::RevertButtonMap(const JOYSTICK_INFO* joystick)
+void CPeripheralJoystick::RevertButtonMap(const kodi::addon::Joystick& joystick)
 {
-  if (joystick == nullptr)
-    return;
-
-  kodi::addon::Joystick addonJoystick(*joystick);
-
-  CStorageManager::Get().RevertButtonMap(addonJoystick);
+  CStorageManager::Get().RevertButtonMap(joystick);
 }
 
-void CPeripheralJoystick::ResetButtonMap(const JOYSTICK_INFO* joystick, const char* controller_id)
+void CPeripheralJoystick::ResetButtonMap(const kodi::addon::Joystick& joystick, const std::string& controller_id)
 {
-  if (!joystick || !controller_id)
-    return;
-
-  kodi::addon::Joystick addonJoystick(*joystick);
-
-  CStorageManager::Get().ResetButtonMap(addonJoystick, controller_id);
+  CStorageManager::Get().ResetButtonMap(joystick, controller_id);
 }
 
 void CPeripheralJoystick::PowerOffJoystick(unsigned int index)

src/addon.h

@@ -29,29 +29,24 @@ class DLL_PRIVATE CPeripheralJoystick
   ADDON_STATUS GetStatus() override;
   ADDON_STATUS SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue) override;
 
-  void GetCapabilities(PERIPHERAL_CAPABILITIES &capabilities) override;
-  PERIPHERAL_ERROR PerformDeviceScan(unsigned int* peripheral_count, PERIPHERAL_INFO** scan_results) override;
-  void FreeScanResults(unsigned int peripheral_count, PERIPHERAL_INFO* scan_results) override;
-  PERIPHERAL_ERROR GetEvents(unsigned int* event_count, PERIPHERAL_EVENT** events) override;
-  void FreeEvents(unsigned int event_count, PERIPHERAL_EVENT* events) override;
-  bool SendEvent(const PERIPHERAL_EVENT* event) override;
-  PERIPHERAL_ERROR GetJoystickInfo(unsigned int index, JOYSTICK_INFO* info) override;
-  void FreeJoystickInfo(JOYSTICK_INFO* info) override;
-  PERIPHERAL_ERROR GetFeatures(const JOYSTICK_INFO* joystick, const char* controller_id,
-                                       unsigned int* feature_count, JOYSTICK_FEATURE** features) override;
-  void FreeFeatures(unsigned int feature_count, JOYSTICK_FEATURE* features) override;
-  PERIPHERAL_ERROR MapFeatures(const JOYSTICK_INFO* joystick, const char* controller_id,
-                                       unsigned int feature_count, const JOYSTICK_FEATURE* features) override;
-  PERIPHERAL_ERROR GetIgnoredPrimitives(const JOYSTICK_INFO* joystick,
-                                                unsigned int* primitive_count,
-                                                JOYSTICK_DRIVER_PRIMITIVE** primitives) override;
-  void FreePrimitives(unsigned int primitive_count, JOYSTICK_DRIVER_PRIMITIVE* primitives) override;
-  PERIPHERAL_ERROR SetIgnoredPrimitives(const JOYSTICK_INFO* joystick,
-                                                unsigned int primitive_count,
-                                                const JOYSTICK_DRIVER_PRIMITIVE* primitives) override;
-  void SaveButtonMap(const JOYSTICK_INFO* joystick) override;
-  void RevertButtonMap(const JOYSTICK_INFO* joystick) override;
-  void ResetButtonMap(const JOYSTICK_INFO* joystick, const char* controller_id) override;
+  void GetCapabilities(kodi::addon::PeripheralCapabilities& capabilities) override;
+  PERIPHERAL_ERROR PerformDeviceScan(std::vector<std::shared_ptr<kodi::addon::Peripheral>>& scan_results) override;
+  PERIPHERAL_ERROR GetEvents(std::vector<kodi::addon::PeripheralEvent>& events) override;
+  bool SendEvent(const kodi::addon::PeripheralEvent& event) override;
+  PERIPHERAL_ERROR GetJoystickInfo(unsigned int index, kodi::addon::Joystick& info) override;
+  PERIPHERAL_ERROR GetFeatures(const kodi::addon::Joystick& joystick,
+                               const std::string& controller_id,
+                               std::vector<kodi::addon::JoystickFeature>& features) override;
+  PERIPHERAL_ERROR MapFeatures(const kodi::addon::Joystick& joystick,
+                               const std::string& controller_id,
+                               const std::vector<kodi::addon::JoystickFeature>& features) override;
+  PERIPHERAL_ERROR GetIgnoredPrimitives(const kodi::addon::Joystick& joystick,
+                                        std::vector<kodi::addon::DriverPrimitive>& primitives) override;
+  PERIPHERAL_ERROR SetIgnoredPrimitives(const kodi::addon::Joystick& joystick,
+                                        const std::vector<kodi::addon::DriverPrimitive>& primitives) override;
+  void SaveButtonMap(const kodi::addon::Joystick& joystick) override;
+  void RevertButtonMap(const kodi::addon::Joystick& joystick) override;
+  void ResetButtonMap(const kodi::addon::Joystick& joystick, const std::string& controller_id) override;
   void PowerOffJoystick(unsigned int index) override;
 
 private:

src/api/Joystick.h

@@ -10,7 +10,7 @@
 
 #include "JoystickTypes.h"
 
-#include <kodi/addon-instance/PeripheralUtils.h>
+#include <kodi/addon-instance/Peripheral.h>
 
 #include <string>
 #include <vector>

src/api/JoystickManager.h

@@ -11,7 +11,7 @@
 #include "JoystickTypes.h"
 #include "buttonmapper/ButtonMapTypes.h"
 
-#include <kodi/addon-instance/PeripheralUtils.h>
+#include <kodi/addon-instance/peripheral/PeripheralUtils.h>
 
 #include <mutex>
 #include <set>

src/buttonmapper/ButtonMapTranslator.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <kodi/addon-instance/PeripheralUtils.h>
+#include <kodi/addon-instance/peripheral/PeripheralUtils.h>
 
 #include <string>
 

src/buttonmapper/ButtonMapTypes.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <kodi/addon-instance/PeripheralUtils.h>
+#include <kodi/addon-instance/peripheral/PeripheralUtils.h>
 
 #include <map>
 #include <memory>

src/buttonmapper/ButtonMapUtils.cpp

@@ -8,7 +8,7 @@
 
 #include "ButtonMapUtils.h"
 
-#include <kodi/addon-instance/PeripheralUtils.h>
+#include <kodi/addon-instance/peripheral/PeripheralUtils.h>
 
 #include <array>
 #include <map>

src/buttonmapper/ButtonMapper.cpp

@@ -11,7 +11,7 @@
 #include "ControllerTransformer.h"
 #include "storage/IDatabase.h"
 
-#include <kodi/addon-instance/PeripheralUtils.h>
+#include <kodi/addon-instance/peripheral/PeripheralUtils.h>
 
 #include <algorithm>
 #include <iterator>

src/buttonmapper/ControllerTransformer.cpp

@@ -12,7 +12,7 @@
 #include "storage/Device.h"
 #include "utils/CommonMacros.h"
 
-#include <kodi/addon-instance/PeripheralUtils.h>
+#include <kodi/addon-instance/peripheral/PeripheralUtils.h>
 
 #include <algorithm>