audiodecoder API Version 4.0.0 update

xbmc · Oct 17, 2021 · 012437e · 012437e
1 parent 692f023
commit 012437e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 8 deletions.
diff --git a/audiodecoder.dumb/addon.xml.in b/audiodecoder.dumb/addon.xml.in
@@ -8,8 +8,19 @@
   <extension
     point="kodi.audiodecoder"
     name="dumb"
-    extension=".it|.xm|.s3m"
-    library_@PLATFORM@="@LIBRARY_FILENAME@"/>
+    library_@PLATFORM@="@LIBRARY_FILENAME@">
+    <support>
+      <extension name=".it">
+        <description>30100</description>
+      </extension>
+      <extension name=".xm">
+        <description>30101</description>
+      </extension>
+      <extension name=".s3m">
+        <description>30102</description>
+      </extension>
+    </support>
+  </extension>
   <extension point="xbmc.addon.metadata">
     <platform>@PLATFORM@</platform>
     <license>GPL-2.0-or-later</license>

diff --git a/audiodecoder.dumb/resources/language/resource.language.en_gb/strings.po b/audiodecoder.dumb/resources/language/resource.language.en_gb/strings.po
@@ -31,3 +31,21 @@ msgstr ""
 msgctxt "Addon Lifecyclestate"
 msgid "Replaced by audiodecoder.openmpt addon! However, but still usable here."
 msgstr ""
+
+#. Supported file extension description about ".it"
+#: audiodecoder.dumb/addon.xml.in
+msgctxt "#30100"
+msgid "Music module created by Impulse Tracker, an audio tracking program."
+msgstr ""
+
+#. Supported file extension description about ".xm"
+#: audiodecoder.dumb/addon.xml.in
+msgctxt "#30101"
+msgid "Music module created by Fasttracker 2, an audio tracker program."
+msgstr ""
+
+#. Supported file extension description about ".s3m"
+#: audiodecoder.dumb/addon.xml.in
+msgctxt "#30102"
+msgid "Audio module format used by Scream Tracker 3.0 and later."
+msgstr ""
diff --git a/src/DumbCodec.cpp b/src/DumbCodec.cpp
@@ -152,7 +152,7 @@ bool CDumbCodec::Init(const std::string& filename,
   return true;
 }
 
-int CDumbCodec::ReadPCM(uint8_t* buffer, int size, int& actualsize)
+int CDumbCodec::ReadPCM(uint8_t* buffer, size_t size, size_t& actualsize)
 {
   // Read samples from libdumb save them to the SDL buffer. Note that we are
   // reading SAMPLES, not bytes!
@@ -169,9 +169,9 @@ int CDumbCodec::ReadPCM(uint8_t* buffer, int size, int& actualsize)
     m_position = m_totaltime;
 
   if (actualsize == 0)
-    return -1;
+    return AUDIODECODER_READ_EOF;
 
-  return 0;
+  return AUDIODECODER_READ_SUCCESS;
 }
 
 int64_t CDumbCodec::Seek(int64_t time)
@@ -181,7 +181,7 @@ int64_t CDumbCodec::Seek(int64_t time)
 
 //------------------------------------------------------------------------------
 
-class ATTRIBUTE_HIDDEN CMyAddon : public kodi::addon::CAddonBase
+class ATTR_DLL_LOCAL CMyAddon : public kodi::addon::CAddonBase
 {
 public:
   CMyAddon() = default;

diff --git a/src/DumbCodec.h b/src/DumbCodec.h
@@ -15,7 +15,7 @@ extern "C"
 #include <dumb.h>
 } /* extern "C" */
 
-class ATTRIBUTE_HIDDEN CDumbCodec : public kodi::addon::CInstanceAudioDecoder
+class ATTR_DLL_LOCAL CDumbCodec : public kodi::addon::CInstanceAudioDecoder
 {
 public:
   CDumbCodec(KODI_HANDLE instance, const std::string& version);
@@ -30,7 +30,7 @@ class ATTRIBUTE_HIDDEN CDumbCodec : public kodi::addon::CInstanceAudioDecoder
             int& bitrate,
             AudioEngineDataFormat& format,
             std::vector<AudioEngineChannel>& channellist) override;
-  int ReadPCM(uint8_t* buffer, int size, int& actualsize) override;
+  int ReadPCM(uint8_t* buffer, size_t size, size_t& actualsize) override;
   int64_t Seek(int64_t time) override;
 
 private: