Merge pull request #320 from David-EIPI/cvariant_collision

Put CVariant into own namespace

Author: phunkyfish

inputstream.ffmpegdirect/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="inputstream.ffmpegdirect"
-  version="22.1.0"
+  version="22.1.1"
   name="Inputstream FFmpeg Direct"
   provider-name="Ross Nicholson">
   <requires>@ADDON_DEPENDS@</requires>

inputstream.ffmpegdirect/changelog.txt

@@ -1,3 +1,6 @@
+v22.1.1
+- Move CVariant to ffmpegdirect namespace to avoid collision with CVariant in Kodi, which causes random crashes when playing streams with this addon.
+
 v22.1.0
 - Bump ffmpeg to 7.1 and add patch to fix build on aarch64 targeting ios/tvos
 - Bump gnutls to 3.8.8 and add patch to fix build on Android NDK r27+

src/stream/url/URL.cpp

@@ -25,6 +25,7 @@
 #include <kodi/tools/StringUtils.h>
 
 using namespace kodi::tools;
+using namespace ffmpegdirect;
 //using namespace ADDON;
 
 namespace

src/stream/url/UrlOptions.cpp

@@ -157,7 +157,7 @@ bool CUrlOptions::HasOption(const std::string &key) const
   return m_options.find(key) != m_options.end();
 }
 
-bool CUrlOptions::GetOption(const std::string &key, CVariant &value) const
+bool CUrlOptions::GetOption(const std::string &key, ffmpegdirect::CVariant &value) const
 {
   if (key.empty())
     return false;

src/stream/url/UrlOptions.h

@@ -15,7 +15,7 @@
 class CUrlOptions
 {
 public:
-  typedef std::map<std::string, CVariant> UrlOptions;
+  typedef std::map<std::string, ffmpegdirect::CVariant> UrlOptions;
 
   CUrlOptions();
   CUrlOptions(const std::string &options, const char *strLead = "");
@@ -37,7 +37,7 @@ class CUrlOptions
   virtual void RemoveOption(const std::string &key);
 
   bool HasOption(const std::string &key) const;
-  bool GetOption(const std::string &key, CVariant &value) const;
+  bool GetOption(const std::string &key, ffmpegdirect::CVariant &value) const;
 
 protected:
   UrlOptions m_options;

src/stream/url/Variant.cpp

@@ -11,6 +11,8 @@
 #include <string.h>
 #include <utility>
 
+using namespace ffmpegdirect;
+
 #ifndef strtoll
 #ifdef TARGET_WINDOWS
 #define strtoll  _strtoi64

src/stream/url/Variant.h

@@ -25,6 +25,8 @@ double str2double(const std::wstring &str, double fallback = 0.0);
 #pragma pack(8)
 #endif
 
+namespace ffmpegdirect
+{
 class CVariant
 {
 public:
@@ -162,6 +164,8 @@ class CVariant
   static VariantMap EMPTY_MAP;
 };
 
+} // namespace ffmpegdirect
+
 #ifdef TARGET_WINDOWS_STORE
 #pragma pack(pop)
 #endif