Skip to content

Commit f19f6f8

Browse files
AlwinEschAlwinEsch
authored
Merge pull request #226 from AlwinEsch/Nexus-change
[Nexus] API related update
2 parents 2786720 + 176a18e commit f19f6f8

File tree

12 files changed

+44
-48
lines changed

12 files changed

+44
-48
lines changed

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
- script: |
4848
cd ..
49-
git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git kodi
49+
git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi
5050
cd $(Build.SourcesDirectory)
5151
mkdir build
5252
cd build

‎peripheral.joystick/addon.xml.in‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<addon
33
id="peripheral.joystick"
4-
version="20.0.0"
4+
version="20.1.0"
55
name="Joystick Support"
66
provider-name="Team Kodi">
77
<requires>@ADDON_DEPENDS@</requires>
@@ -23,8 +23,10 @@
2323
<summary lang="en_GB">Kodi Joystick Library</summary>
2424
<summary lang="es_ES">Librería Kodi Joystick</summary>
2525
<summary lang="es_MX">Biblioteca de Joysticks de Kodi</summary>
26+
<summary lang="fr_FR">Bibliothèque de joystick Kodi</summary>
2627
<summary lang="ko_KR">Kodi 조이스틱 라이브러리</summary>
2728
<summary lang="pl_PL">Biblioteka joysticków Kodi</summary>
29+
<summary lang="pt_BR">Biblioteca de Joystick do Kodi</summary>
2830
<summary lang="ru_RU">Каталог джойстиков для Kodi</summary>
2931
<summary lang="tr_TR">Kodi Oyun Çubuğu Kütüphanesi</summary>
3032
<summary lang="zh_CN">Kodi 游戏杆库</summary>
@@ -36,6 +38,7 @@
3638
<description lang="es_MX">Esta biblioteca provee controladores de joysticks y mapas de botones. Múltiples APIs de joystick están soportadas, incluyendo DirectX, XInput, SDL y la Linux Joystick API.</description>
3739
<description lang="ko_KR">이 라이브러리는 조이스틱 드라이버와 버튼 맵을 제공합니다. DirectX, XInput, SDL 및 Linux Joystick API를 비롯한 여러 조이스틱 API가 지원됩니다.</description>
3840
<description lang="pl_PL">Ta biblioteka zawiera sterowniki joysticków i mapy przycisków. Obsługiwanych jest wiele interfejsów API joysticków, m.in. DirectX, XInput, SDL oraz Joystick API systemu Linux.</description>
41+
<description lang="pt_BR">Esta biblioteca fornece drivers de joystick e mapeamento de botões. Diversas APIs de joystick são suportadas, incluindo DirectX, XInput, SDL e API de Joystick do Linux.</description>
3942
<description lang="ru_RU">Этот каталог предоставляет драйверы джойстиков и схемы расположения кнопок. Поддерживается несколько API джойстиков, включая DirectX, XInput, SDL и Linux Joystick API.</description>
4043
<description lang="tr_TR">Bu kitaplık, oyun çubuğu sürücüleri ve düğme haritaları sağlar. DirectX, XInput, SDL ve Linux Oyun Çubuğu API dahil olmak üzere çoklu oyun çubuğu API'leri desteklenir.</description>
4144
<description lang="zh_CN">此库提供游戏杆驱动程序和按钮图。支持多个游戏杆 API，包括 DirectX、XInput、SDL 和 Linux 游戏杆 API。</description>

‎peripheral.joystick/resources/language/resource.language.fr_fr/strings.po‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,65 +5,66 @@
55
msgid ""
66
msgstr ""
77
"Project-Id-Version: peripheral.joystick\n"
8-
"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
8+
"Report-Msgid-Bugs-To: translations@kodi.tv\n"
99
"POT-Creation-Date: 2016-12-06 21:53i\n"
10-
"PO-Revision-Date: 2021-05-23 08:29+0000\n"
11-
"Last-Translator: Christian Gade <gade@kodi.tv>\n"
10+
"PO-Revision-Date: 2021-11-23 14:47+0000\n"
11+
"Last-Translator: Édouard Duliège <edouard@duliege.com>\n"
1212
"Language-Team: French (France) <https://kodi.weblate.cloud/projects/kodi-add-ons-peripherals/peripheral-joystick/fr_fr/>\n"
1313
"Language: fr_fr\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding: 8bit\n"
1717
"Plural-Forms: nplurals=2; plural=n > 1;\n"
18-
"X-Generator: Weblate 4.6.2\n"
18+
"X-Generator: Weblate 4.9\n"
1919

2020
msgctxt "Addon Summary"
2121
msgid "Kodi Joystick Library"
22-
msgstr ""
22+
msgstr "Bibliothèque de joystick Kodi"
2323

2424
msgctxt "Addon Description"
2525
msgid "This library provides joystick drivers and button maps. Multiple joystick APIs are supported, including DirectX, XInput, SDL and the Linux Joystick API."
2626
msgstr ""
2727

28+
#, fuzzy
2829
msgctxt "#30000"
2930
msgid "Driver settings"
30-
msgstr "Paramètres des pilot"
31+
msgstr "Paramètres des pilotes"
3132

3233
msgctxt "#30001"
3334
msgid "Joystick driver"
34-
msgstr ""
35+
msgstr "Pilote du joystick"
3536

3637
msgctxt "#30002"
3738
msgid "None"
3839
msgstr "Aucun"
3940

4041
msgctxt "#30003"
4142
msgid "Enable XInput"
42-
msgstr ""
43+
msgstr "Activer XInput"
4344

4445
msgctxt "#30004"
4546
msgid "Enable DirectInput"
46-
msgstr ""
47+
msgstr "Activer DirectInput"
4748

4849
#. Do not translate
4950
msgctxt "#30005"
5051
msgid "Linux"
51-
msgstr ""
52+
msgstr "Linux"
5253

5354
#. Do not translate
5455
msgctxt "#30006"
5556
msgid "Cocoa"
56-
msgstr ""
57+
msgstr "Cocoa"
5758

5859
#. Do not translate
5960
msgctxt "#30007"
6061
msgid "Udev"
61-
msgstr ""
62+
msgstr "Udev"
6263

6364
#. Do not translate
6465
msgctxt "#30008"
6566
msgid "SDL 2"
66-
msgstr ""
67+
msgstr "SDL 2"
6768

6869
#msgctxt "#21475"
6970
#msgid "Both"

‎peripheral.joystick/resources/language/resource.language.pt_br/strings.po‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,65 +5,65 @@
55
msgid ""
66
msgstr ""
77
"Project-Id-Version: peripheral.joystick\n"
8-
"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
8+
"Report-Msgid-Bugs-To: translations@kodi.tv\n"
99
"POT-Creation-Date: 2016-12-06 21:53i\n"
10-
"PO-Revision-Date: 2021-05-23 08:29+0000\n"
11-
"Last-Translator: Christian Gade <gade@kodi.tv>\n"
10+
"PO-Revision-Date: 2021-12-08 01:13+0000\n"
11+
"Last-Translator: Fabio <fabioihle+kodi@alunos.utfpr.edu.br>\n"
1212
"Language-Team: Portuguese (Brazil) <https://kodi.weblate.cloud/projects/kodi-add-ons-peripherals/peripheral-joystick/pt_br/>\n"
1313
"Language: pt_br\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding: 8bit\n"
1717
"Plural-Forms: nplurals=2; plural=n > 1;\n"
18-
"X-Generator: Weblate 4.6.2\n"
18+
"X-Generator: Weblate 4.9.1\n"
1919

2020
msgctxt "Addon Summary"
2121
msgid "Kodi Joystick Library"
22-
msgstr ""
22+
msgstr "Biblioteca de Joystick do Kodi"
2323

2424
msgctxt "Addon Description"
2525
msgid "This library provides joystick drivers and button maps. Multiple joystick APIs are supported, including DirectX, XInput, SDL and the Linux Joystick API."
26-
msgstr ""
26+
msgstr "Esta biblioteca fornece drivers de joystick e mapeamento de botões. Diversas APIs de joystick são suportadas, incluindo DirectX, XInput, SDL e API de Joystick do Linux."
2727

2828
msgctxt "#30000"
2929
msgid "Driver settings"
3030
msgstr "Ajustes do driver"
3131

3232
msgctxt "#30001"
3333
msgid "Joystick driver"
34-
msgstr ""
34+
msgstr "Driver de joystick"
3535

3636
msgctxt "#30002"
3737
msgid "None"
3838
msgstr "Nenhum"
3939

4040
msgctxt "#30003"
4141
msgid "Enable XInput"
42-
msgstr ""
42+
msgstr "Ativar XInput"
4343

4444
msgctxt "#30004"
4545
msgid "Enable DirectInput"
46-
msgstr ""
46+
msgstr "Ativar DirectInput"
4747

4848
#. Do not translate
4949
msgctxt "#30005"
5050
msgid "Linux"
51-
msgstr ""
51+
msgstr "Linux"
5252

5353
#. Do not translate
5454
msgctxt "#30006"
5555
msgid "Cocoa"
56-
msgstr ""
56+
msgstr "Cocoa"
5757

5858
#. Do not translate
5959
msgctxt "#30007"
6060
msgid "Udev"
61-
msgstr ""
61+
msgstr "Udev"
6262

6363
#. Do not translate
6464
msgctxt "#30008"
6565
msgid "SDL 2"
66-
msgstr ""
66+
msgstr "SDL 2"
6767

6868
#msgctxt "#21475"
6969
#msgid "Both"

‎src/addon.cpp‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,12 @@ ADDON_STATUS CPeripheralJoystick::Create()
4747
return ADDON_STATUS_NEED_SETTINGS;
4848
}
4949

50-
ADDON_STATUS CPeripheralJoystick::SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue)
50+
ADDON_STATUS CPeripheralJoystick::SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue)
5151
{
5252
CSettings::Get().SetSetting(settingName, settingValue);
5353
return ADDON_STATUS_OK;
5454
}
5555

56-
57-
ADDON_STATUS CPeripheralJoystick::GetStatus()
58-
{
59-
if (!CSettings::Get().IsInitialized())
60-
return ADDON_STATUS_NEED_SETTINGS;
61-
62-
return ADDON_STATUS_OK;
63-
}
64-
6556
CPeripheralJoystick::~CPeripheralJoystick()
6657
{
6758
CStorageManager::Get().Deinitialize();

‎src/addon.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ class DLL_PRIVATE CPeripheralJoystick
2626
virtual ~CPeripheralJoystick();
2727

2828
ADDON_STATUS Create() override;
29-
ADDON_STATUS GetStatus() override;
30-
ADDON_STATUS SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue) override;
29+
ADDON_STATUS SetSetting(const std::string& settingName, const kodi::addon::CSettingValue& settingValue) override;
3130

3231
void GetCapabilities(kodi::addon::PeripheralCapabilities& capabilities) override;
3332
PERIPHERAL_ERROR PerformDeviceScan(std::vector<std::shared_ptr<kodi::addon::Peripheral>>& scan_results) override;

‎src/filesystem/DirectoryCache.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#pragma once
1010

11+
#include "utils/CommonMacros.h"
12+
1113
#include <kodi/Filesystem.h>
1214

1315
#include <chrono>
@@ -27,7 +29,7 @@ namespace JOYSTICK
2729
virtual void OnRemove(const kodi::vfs::CDirEntry& item) = 0;
2830
};
2931

30-
class CDirectoryCache
32+
class DLL_PRIVATE CDirectoryCache
3133
{
3234
public:
3335
void Initialize(IDirectoryCacheCallback* callbacks);

‎src/log/LogAddon.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CLogAddon::CLogAddon()
2020

2121
void CLogAddon::Log(SYS_LOG_LEVEL level, const char* logline)
2222
{
23-
AddonLog loglevel;
23+
ADDON_LOG loglevel;
2424

2525
switch (level)
2626
{

‎src/settings/Settings.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CSettings& CSettings::Get(void)
3333
return _instance;
3434
}
3535

36-
void CSettings::SetSetting(const std::string& strName, const kodi::CSettingValue& value)
36+
void CSettings::SetSetting(const std::string& strName, const kodi::addon::CSettingValue& value)
3737
{
3838
if (strName == SETTING_RETROARCH_CONFIG)
3939
{

‎src/settings/Settings.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace JOYSTICK
2424
/*!
2525
* \brief Set the value of a setting. Called by the frontend.
2626
*/
27-
void SetSetting(const std::string& strName, const kodi::CSettingValue& value);
27+
void SetSetting(const std::string& strName, const kodi::addon::CSettingValue& value);
2828

2929
/*!
3030
* \brief Check if the settings have been initialized

0 commit comments

Comments
 (0)