Skip to content

Commit 8169d0b

Browse files
AlwinEschAlwinEsch
authored
Merge pull request #46 from AlwinEsch/Nexus-change
[nexus] API related update
2 parents b826dc6 + dadc4a5 commit 8169d0b

File tree

11 files changed

+55
-54
lines changed

11 files changed

+55
-54
lines changed

‎audiodecoder.sacd/addon.xml.in‎

Lines changed: 3 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="audiodecoder.sacd"
4-
version="20.1.0"
4+
version="20.2.0"
55
name="SACD ISO support"
66
provider-name="Team Kodi, AlwinEsch">
77
<requires>@ADDON_DEPENDS@</requires>
@@ -34,13 +34,15 @@
3434
<summary lang="de_DE">Super Audio CD ISO-Image</summary>
3535
<summary lang="en_GB">Super Audio CD ISO image</summary>
3636
<summary lang="es_ES">Imagen ISO Super Audio CD</summary>
37+
<summary lang="id_ID">Audio Super CD ISO image</summary>
3738
<summary lang="ko_KR">Super Audio CD ISO 이미지</summary>
3839
<summary lang="ru_RU">ISO-образ Super Audio CD</summary>
3940
<summary lang="zh_CN">超级音频 CD ISO 映像</summary>
4041
<description lang="da_DK">Dette addon gør det muligt for Kodi at læse indhold fra et Super Audio CD ISO-billede.[CR][CR]Super Audio CD (SACD) er et skrivebeskyttet optisk diskformat til lydopbevaring, introduceret i 1999, udviklet i fællesskab af Sony og Philips Electronics at blive efterfølgeren til Compact Disc.[CR][CR]SACD -formatet tilbyder flere lydkanaler (f.eks. surround-lyd), en højere bithastighed og længere spilletid end en konventionel CD.</description>
4142
<description lang="de_DE">Mit diesem Addon kann Kodi Inhalte von einem Super Audio CD ISO-Image lesen.[CR][CR]Super Audio CD (SACD) ist ein schreibgeschütztes optisches Disc-Format für die Audiospeicherung, das 1999 eingeführt wurde und von Sony und Philips Electronics gemeinsam als Nachfolger der Compact Disc entwickelt wurde.[CR][CR]Das SACD-Format bietet mehr Audiokanäle (z. B. Surround-Sound), eine höhere Bitrate und eine längere Wiedergabezeit als eine herkömmliche CD.</description>
4243
<description lang="en_GB">This addon allows Kodi to read content from a Super Audio CD ISO image.[CR][CR]Super Audio CD (SACD) is a read-only optical disc format for audio storage, introduced in 1999, developed jointly by Sony and Philips Electronics to be the successor to the Compact Disc.[CR][CR]The SACD format offers more audio channels (e.g. surround sound), a higher bit rate, and longer playing time than a conventional CD.</description>
4344
<description lang="es_ES">Este addon permite a Kodi leer contenido de una imagen ISO de Super Audio CD.[CR][CR]Super Audio CD (SCAD) es un formato de disco óptico de solo lectura para almacenamiento de audio, introducido en 1999 y desarrollado conjuntamente por Sony y Philips Electronics para ser el sucesor del Compact Disc.[CR][CR]El formato SACD ofrece mas canales de audio (p.ej. sonido Surround), una tasa de bits más alta, y más tiempo de reproducción que un CD convencional.</description>
45+
<description lang="id_ID">Addon ini memungkinkan Kodi untuk membaca konten dari gambar ISO Super Audio CD.[CR][CR]Super Audio CD (SACD) adalah format cakram optik hanya-baca untuk penyimpanan audio, diperkenalkan pada tahun 1999, dikembangkan bersama oleh Sony dan Philips Electronics menjadi penerus Compact Disc.[CR][CR]Format SACD menawarkan lebih banyak saluran audio (misalnya suara surround), bit rate yang lebih tinggi, dan waktu pemutaran yang lebih lama daripada CD konvensional.</description>
4446
<description lang="ko_KR">이 애드온은 Kodi가 Super Audio CD ISO 이미지에서 콘텐트를 읽게 해줍니다. [CR][CR] Super Audio CD (SACD)는 오디오 저장을 위한 읽기 전용 광학 디스크 포맷으로, 1999년에 도입되었고, 소니와 필립스전자가 CD 후속으로 공동개발했습니다. [CR][CR] SACD 포맷은 일반 CD보다 더 많은 오디오 채널 (즉, 서라운드 사운드 제공), 더 높은 비트 레이트, 더 긴 재생 시간을 제공합니다.</description>
4547
<description lang="ru_RU">Это дополнение позволяет Kodi читать содержимое из ISO-образа Super Audio CD.[CR][CR]Super Audio CD (SACD) - это формат оптического диска для хранения аудиофайлов только для чтения, представленный в 1999 году и разработанный совместно компаниями Sony и Philips Electronics как преемник компакт-диска.[CR][CR]Формат SACD предлагает больше аудиоканалов (например, объёмный звук), более высокий битрейт и большее время воспроизведения, чем обычный CD.</description>
4648
<description lang="zh_CN">此插件允许 Kodi 从超级音频 CD ISO 映像中读取内容。[CR][CR]超级音频 CD（SACD）是一种用于音频存储的只读光盘格式，作为光盘的继任者于1999年推出，由索尼和飞利浦电子共同开发。[CR][CR]SACD 格式提供更多音频通道（例如环绕声），比传统 CD 具有更高的比特率和更长的播放时间。</description>

‎audiodecoder.sacd/changelog.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
v20.2.0:
2+
- Translation updates by Weblate
3+
- Kodi main API update to version 2.0.0
4+
15
v20.1.0:
26
- Translation updates by Weblate
37
- Kodi audiodecoder API update to version 4.0.0

‎audiodecoder.sacd/resources/language/resource.language.de_de/strings.po‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ msgstr ""
77
"Project-Id-Version: KODI Addons\n"
88
"Report-Msgid-Bugs-To: translations@kodi.tv\n"
99
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
10-
"PO-Revision-Date: 2021-10-03 11:47+0000\n"
11-
"Last-Translator: Kai Sommerfeld <kai.sommerfeld@gmx.com>\n"
10+
"PO-Revision-Date: 2021-12-11 21:13+0000\n"
11+
"Last-Translator: matchuek <hansi77@yandex.com>\n"
1212
"Language-Team: German <https://kodi.weblate.cloud/projects/kodi-add-ons-audio-decodersencoders/audiodecoder-sacd/de_de/>\n"
1313
"Language: de_de\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.8\n"
18+
"X-Generator: Weblate 4.9.1\n"
1919

2020
msgctxt "Addon Summary"
2121
msgid "Super Audio CD ISO image"
@@ -176,12 +176,12 @@ msgstr "Erst alle Stereo-Tracks, dann alle Multikanal-Tracks einsortieren."
176176
#. Boolean setting to allow play fallback if Multichannel selected and only Stereo available, or the other direction
177177
msgctxt "#30052"
178178
msgid "Fall back when preferred track area is empty"
179-
msgstr ""
179+
msgstr "Bei leerer bevorzugter Spur herunterregeln"
180180

181181
#. Help text to boolean setting on id 30052.
182182
msgctxt "#30053"
183183
msgid "If preferred tracks (stereo or multichannel) are not available, a different method is used to fall back."
184-
msgstr ""
184+
msgstr "Eine andere Variante wird verwendet, wenn die bevorzugte Spur (Stereo oder Mehrkanal) nicht verfügbar ist."
185185

186186
#. Format label about selectable volume in dB, for settings defined with label id 30020 and 30022
187187
msgctxt "#30070"

‎audiodecoder.sacd/resources/language/resource.language.id_id/strings.po‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,25 @@
55
msgid ""
66
msgstr ""
77
"Project-Id-Version: KODI Addons\n"
8-
"Report-Msgid-Bugs-To: https://github.com/xbmc/audiodecoder.sacd/issues/\n"
8+
"Report-Msgid-Bugs-To: translations@kodi.tv\n"
99
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
10-
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11-
"Last-Translator: Automatically generated\n"
12-
"Language-Team: none\n"
10+
"PO-Revision-Date: 2021-11-23 00:13+0000\n"
11+
"Last-Translator: Nao3Line Prez <n.yazawa6932@gmail.com>\n"
12+
"Language-Team: Indonesian <https://kodi.weblate.cloud/projects/kodi-add-ons-audio-decodersencoders/audiodecoder-sacd/id_id/>\n"
1313
"Language: id_id\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=1; plural=0;\n"
18+
"X-Generator: Weblate 4.9\n"
1819

1920
msgctxt "Addon Summary"
2021
msgid "Super Audio CD ISO image"
21-
msgstr ""
22+
msgstr "Audio Super CD ISO image"
2223

2324
msgctxt "Addon Description"
2425
msgid "This addon allows Kodi to read content from a Super Audio CD ISO image.[CR][CR]Super Audio CD (SACD) is a read-only optical disc format for audio storage, introduced in 1999, developed jointly by Sony and Philips Electronics to be the successor to the Compact Disc.[CR][CR]The SACD format offers more audio channels (e.g. surround sound), a higher bit rate, and longer playing time than a conventional CD."
25-
msgstr ""
26+
msgstr "Addon ini memungkinkan Kodi untuk membaca konten dari gambar ISO Super Audio CD.[CR][CR]Super Audio CD (SACD) adalah format cakram optik hanya-baca untuk penyimpanan audio, diperkenalkan pada tahun 1999, dikembangkan bersama oleh Sony dan Philips Electronics menjadi penerus Compact Disc.[CR][CR]Format SACD menawarkan lebih banyak saluran audio (misalnya suara surround), bit rate yang lebih tinggi, dan waktu pemutaran yang lebih lama daripada CD konvensional."
2627

2728
# [Consistency] Make terms, settings names, brands and other minutiae, consistent throughout file.
2829
# [Capitalization] Avoid capitalizing every second word. See http://grammarist.com/capitalization/
@@ -34,57 +35,57 @@ msgstr ""
3435
#. Settings slider to change/adjust main volume about played songs, before given to Kodi.
3536
msgctxt "#30020"
3637
msgid "Volume adjust"
37-
msgstr ""
38+
msgstr "Penyesuaian volume"
3839

3940
#. Help text to slider setting on id 30020.
4041
msgctxt "#30021"
4142
msgid "To change speaker volume with setting value during playback."
42-
msgstr ""
43+
msgstr "Untuk mengubah volume speaker dengan nilai pengaturan selama pemutaran."
4344

4445
#. Settings slider to change/adjust LFE volume about played songs, before given to Kodi.
4546
msgctxt "#30022"
4647
msgid "LFE adjust"
47-
msgstr ""
48+
msgstr "Penyesuaian LFE"
4849

4950
#. Help text to slider setting on id 30022.
5051
msgctxt "#30023"
5152
msgid "To change LFE volume with setting value during playback."
52-
msgstr ""
53+
msgstr "Untuk mengubah volume LFE dengan nilai pengaturan selama pemutaran."
5354

5455
#. Settings list selection about used samplerate where given to Kodi
5556
msgctxt "#30024"
5657
msgid "PCM Samplerate"
57-
msgstr ""
58+
msgstr "Tingkat Sampel PCM"
5859

5960
#. Help text to list selection setting on id 30024.
6061
msgctxt "#30025"
6162
msgid "Sample rate to which the stream is reduced."
62-
msgstr ""
63+
msgstr "Tingkat sampel yang alirannya dikurangi."
6364

6465
#. Settings list selection about DSD2PCM mode, where does the SACD data conversion and downsampling to format used for playback in Kodi
6566
msgctxt "#30026"
6667
msgid "DSD2PCM mode"
67-
msgstr ""
68+
msgstr "Mode DSD2PCM"
6869

6970
#. Help text to slider setting on id 30026.
7071
msgctxt "#30027"
7172
msgid "Processing mode of the stream to perform the best possible resampling."
72-
msgstr ""
73+
msgstr "Mode pemrosesan streaming untuk melakukan pengambilan sampel ulang sebaik mungkin."
7374

7475
#. List selection value about DSD2PCM mode, by setting defined with id 30026
7576
msgctxt "#30028"
7677
msgid "Multistage (32fp)"
77-
msgstr ""
78+
msgstr "Multi stage (32fp)"
7879

7980
#. List selection value about DSD2PCM mode, by setting defined with id 30026
8081
msgctxt "#30029"
8182
msgid "Multistage (64fp)"
82-
msgstr ""
83+
msgstr "Multi stage (64fp)"
8384

8485
#. List selection value about DSD2PCM mode, by setting defined with id 30026
8586
msgctxt "#30030"
8687
msgid "Direct (32fp, 30kHz lowpass)"
87-
msgstr ""
88+
msgstr "Direct (32fp, 30kHz lowpass)"
8889

8990
#. List selection value about DSD2PCM mode, by setting defined with id 30026
9091
msgctxt "#30031"

‎lib/libdstdec/common.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace
1313
{
1414

15-
inline const char* kodiTranslateLogLevel(const AddonLog logLevel)
15+
inline const char* kodiTranslateLogLevel(const ADDON_LOG logLevel)
1616
{
1717
switch (logLevel)
1818
{
@@ -32,7 +32,7 @@ inline const char* kodiTranslateLogLevel(const AddonLog logLevel)
3232
return "LOG_UNKNOWN: ";
3333
}
3434

35-
inline void kodiLog(const AddonLog logLevel, const char* format, ...)
35+
inline void kodiLog(const ADDON_LOG logLevel, const char* format, ...)
3636
{
3737
char buffer[16384];
3838
va_list args;

‎src/Addon.cpp‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,20 @@ CMyAddon::CMyAddon()
1515
CSACDSettings::GetInstance().Load();
1616
}
1717

18-
ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
19-
const std::string& instanceID,
20-
KODI_HANDLE instance,
21-
const std::string& version,
22-
KODI_HANDLE& addonInstance)
18+
ADDON_STATUS CMyAddon::CreateInstance(const kodi::addon::IInstanceInfo& instance,
19+
KODI_ADDON_INSTANCE_HDL& hdl)
2320
{
24-
if (instanceType == ADDON_INSTANCE_AUDIODECODER)
21+
if (instance.IsType(ADDON_INSTANCE_AUDIODECODER))
2522
{
26-
addonInstance = new CSACDAudioDecoder(instance, version);
23+
hdl = new CSACDAudioDecoder(instance);
2724
return ADDON_STATUS_OK;
2825
}
2926

3027
return ADDON_STATUS_UNKNOWN;
3128
}
3229

3330
ADDON_STATUS CMyAddon::SetSetting(const std::string& settingName,
34-
const kodi::CSettingValue& settingValue)
31+
const kodi::addon::CSettingValue& settingValue)
3532
{
3633
return CSACDSettings::GetInstance().SetSetting(settingName, settingValue) ? ADDON_STATUS_OK
3734
: ADDON_STATUS_UNKNOWN;

‎src/Addon.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@ class ATTR_DLL_LOCAL CMyAddon : public kodi::addon::CAddonBase
1515
CMyAddon();
1616
~CMyAddon() override = default;
1717

18-
ADDON_STATUS CreateInstance(int instanceType,
19-
const std::string& instanceID,
20-
KODI_HANDLE instance,
21-
const std::string& version,
22-
KODI_HANDLE& addonInstance) override;
18+
ADDON_STATUS CreateInstance(const kodi::addon::IInstanceInfo& instance,
19+
KODI_ADDON_INSTANCE_HDL& hdl) override;
2320

2421
ADDON_STATUS SetSetting(const std::string& settingName,
25-
const kodi::CSettingValue& settingValue) override;
22+
const kodi::addon::CSettingValue& settingValue) override;
2623
};

‎src/SACDAudio.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ std::string getFileExt(const std::string& s)
2626
return ("");
2727
}
2828

29-
}
29+
} // namespace
3030

31-
CSACDAudioDecoder::CSACDAudioDecoder(KODI_HANDLE instance, const std::string& version)
32-
: CInstanceAudioDecoder(instance, version)
31+
CSACDAudioDecoder::CSACDAudioDecoder(const kodi::addon::IInstanceInfo& instance)
32+
: CInstanceAudioDecoder(instance)
3333
{
3434
}
3535

@@ -110,7 +110,7 @@ bool CSACDAudioDecoder::Init(const std::string& filename,
110110
if (CSACDSettings::GetInstance().GetConverterType() == conv_type_e::USER)
111111
{
112112
std::string path = CSACDSettings::GetInstance().GetConverterFirFile();
113-
if (!path.empty() && LoadFir(kodi::GetAddonPath(path)))
113+
if (!path.empty() && LoadFir(kodi::addon::GetAddonPath(path)))
114114
{
115115
fir_data = m_firData.data();
116116
fir_size = m_firData.size();

‎src/SACDAudio.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ATTR_DLL_LOCAL CSACDAudioDecoder : public kodi::addon::CInstanceAudioDecod
2323
public sacd_core_t
2424
{
2525
public:
26-
CSACDAudioDecoder(KODI_HANDLE instance, const std::string& version);
26+
CSACDAudioDecoder(const kodi::addon::IInstanceInfo& instance);
2727
virtual ~CSACDAudioDecoder() = default;
2828

2929
bool SupportsFile(const std::string& filename) override;

‎src/Settings.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111

1212
bool CSACDSettings::Load()
1313
{
14-
m_volumeAdjust = kodi::GetSettingFloat("volume-adjust", 0.0f);
15-
m_lfeAdjust = pow(10.0f, kodi::GetSettingFloat("lfe-adjust", 0.0f) / 20.0f);
16-
m_samplerate = kodi::GetSettingInt("samplerate", 352800);
17-
m_dsd2pcmMode = kodi::GetSettingInt("dsd2pcm-mode", 0);
18-
m_dsd2pcmFirFile = kodi::GetSettingString("firconverter", "");
19-
m_speakerArea = kodi::GetSettingInt("area", 0);
20-
m_separateMultichannel = kodi::GetSettingBoolean("separate-multichannel", false);
21-
m_separateMultichannel = kodi::GetSettingBoolean("area-allow-fallback", true);
14+
m_volumeAdjust = kodi::addon::GetSettingFloat("volume-adjust", 0.0f);
15+
m_lfeAdjust = pow(10.0f, kodi::addon::GetSettingFloat("lfe-adjust", 0.0f) / 20.0f);
16+
m_samplerate = kodi::addon::GetSettingInt("samplerate", 352800);
17+
m_dsd2pcmMode = kodi::addon::GetSettingInt("dsd2pcm-mode", 0);
18+
m_dsd2pcmFirFile = kodi::addon::GetSettingString("firconverter", "");
19+
m_speakerArea = kodi::addon::GetSettingInt("area", 0);
20+
m_separateMultichannel = kodi::addon::GetSettingBoolean("separate-multichannel", false);
21+
m_separateMultichannel = kodi::addon::GetSettingBoolean("area-allow-fallback", true);
2222

2323
return true;
2424
}
2525

2626
bool CSACDSettings::SetSetting(const std::string& settingName,
27-
const kodi::CSettingValue& settingValue)
27+
const kodi::addon::CSettingValue& settingValue)
2828
{
2929
if (settingName == "volume-adjust")
3030
{

0 commit comments

Comments
 (0)