Merge pull request #864 from AlwinEsch/Nexus-change

[Nexus] API related update
xbmc · Jan 1, 2022 · 1e9924c · 1e9924c
2 parents 785d2b1 + 13ee67a
commit 1e9924c
Show file tree

Hide file tree

Showing 18 changed files with 95 additions and 105 deletions.
diff --git a/inputstream.adaptive/addon.xml.in b/inputstream.adaptive/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="inputstream.adaptive"
-  version="20.0.3"
+  version="20.1.0"
   name="InputStream Adaptive"
   provider-name="peak3d">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/inputstream.adaptive/changelog.txt b/inputstream.adaptive/changelog.txt
@@ -1,3 +1,7 @@
+v20.1.0 (2021-12-23)
+- Translation updates by Weblate
+- Kodi main API update to version 2.0.0
+
 v20.0.3 (2021-12-10)
 - Fix compile error by GCC 11
 - Fix build about global Kodi API version 1.3.1

diff --git a/lib/webm_parser/CMakeLists.txt b/lib/webm_parser/CMakeLists.txt
@@ -96,3 +96,9 @@ set(webm_parser_sources
 
 add_library(webm_parser STATIC ${webm_parser_sources})
 set_target_properties(webm_parser PROPERTIES POSITION_INDEPENDENT_CODE True)
+
+# Fix C++17 Win UWP build error on src/master_parser.h line 156 and 160 with C4996.
+# NOTE: Check sometimes libwebm becomes update byself in future to fix about!
+if(CORE_SYSTEM_NAME MATCHES windows)
+  target_compile_definitions(webm_parser PRIVATE -D_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING)
+endif()
diff --git a/src/ADTSReader.h b/src/ADTSReader.h
@@ -25,7 +25,7 @@
 
 class AP4_ByteStream;
 
-class ATTRIBUTE_HIDDEN ID3TAG
+class ATTR_DLL_LOCAL ID3TAG
 {
 public:
   enum PARSECODE
@@ -49,7 +49,7 @@ class ATTRIBUTE_HIDDEN ID3TAG
 };
 
 
-class ATTRIBUTE_HIDDEN ADTSFrame
+class ATTR_DLL_LOCAL ADTSFrame
 {
 public:
   bool parse(AP4_ByteStream *stream);
@@ -74,7 +74,7 @@ class ATTRIBUTE_HIDDEN ADTSFrame
   AP4_DataBuffer m_dataBuffer;
 };
 
-class ATTRIBUTE_HIDDEN ADTSReader
+class ATTR_DLL_LOCAL ADTSReader
 {
 public:
   ADTSReader(AP4_ByteStream *stream);

diff --git a/src/TSReader.h b/src/TSReader.h
@@ -26,7 +26,7 @@
 
 class AP4_ByteStream;
 
-class ATTRIBUTE_HIDDEN TSReader : public TSDemux::TSDemuxer
+class ATTR_DLL_LOCAL TSReader : public TSDemux::TSDemuxer
 {
 public:
   TSReader(AP4_ByteStream *stream, uint32_t requiredMask);

diff --git a/src/WebmReader.cpp b/src/WebmReader.cpp
@@ -22,7 +22,7 @@
 #include <webm/reader.h>
 #include <webm/webm_parser.h>
 
-class ATTRIBUTE_HIDDEN WebmAP4Reader : public webm::Reader
+class ATTR_DLL_LOCAL WebmAP4Reader : public webm::Reader
 {
 public:
   WebmAP4Reader(AP4_ByteStream *stream) :m_stream(stream) {};

diff --git a/src/WebmReader.h b/src/WebmReader.h
@@ -32,7 +32,7 @@ class AP4_ByteStream;
 class WebmAP4Reader;
 
 
-class ATTRIBUTE_HIDDEN WebmReader : public webm::Callback
+class ATTR_DLL_LOCAL WebmReader : public webm::Callback
 {
 public:
 

diff --git a/src/aes_decrypter.h b/src/aes_decrypter.h
@@ -26,7 +26,7 @@
 
 #include <kodi/AddonBase.h>
 
-class ATTRIBUTE_HIDDEN AESDecrypter : public IAESDecrypter
+class ATTR_DLL_LOCAL AESDecrypter : public IAESDecrypter
 {
 public:
   AESDecrypter(const std::string& licenseKey) : m_licenseKey(licenseKey){};

diff --git a/src/common/AdaptiveStream.h b/src/common/AdaptiveStream.h
@@ -32,14 +32,14 @@ namespace adaptive
 {
   class AdaptiveStream;
 
-  class ATTRIBUTE_HIDDEN AdaptiveStreamObserver
+  class ATTR_DLL_LOCAL AdaptiveStreamObserver
   {
   public:
     virtual void OnSegmentChanged(AdaptiveStream *stream) = 0;
     virtual void OnStreamChange(AdaptiveStream *stream) = 0;
   };
 
-  class ATTRIBUTE_HIDDEN AdaptiveStream
+  class ATTR_DLL_LOCAL AdaptiveStream
   {
   public:
     AdaptiveStream(AdaptiveTree& tree,

diff --git a/src/common/AdaptiveTree.h b/src/common/AdaptiveTree.h
@@ -35,7 +35,7 @@ namespace adaptive
 {
 
 template<typename T>
-struct ATTRIBUTE_HIDDEN SPINCACHE
+struct ATTR_DLL_LOCAL SPINCACHE
 {
   SPINCACHE() :basePos(0) {};
 
@@ -92,7 +92,7 @@ struct ATTRIBUTE_HIDDEN SPINCACHE
   std::vector<T> data;
 };
 
-class ATTRIBUTE_HIDDEN AdaptiveTree
+class ATTR_DLL_LOCAL AdaptiveTree
 {
 public:
   enum StreamType