[CurlUtils] Removed deprecated use of ADDON_READ_CHUNKED

xbmc · Nov 7, 2024 · cf0c715 · cf0c715
1 parent ea39649
commit cf0c715
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/src/common/AdaptiveStream.cpp b/src/common/AdaptiveStream.cpp
@@ -135,7 +135,7 @@ bool adaptive::AdaptiveStream::DownloadImpl(const DownloadInfo& downloadInfo,
   CURL::CUrl curl{url};
   curl.AddHeaders(headers);
 
-  int statusCode = curl.Open(true);
+  int statusCode = curl.Open();
 
   if (statusCode == -1)
     LOG::Log(LOGERROR, "[AS-%u] Download failed, internal error: %s", clsId, url.c_str());

diff --git a/src/samplereader/SubtitleSampleReader.cpp b/src/samplereader/SubtitleSampleReader.cpp
@@ -80,7 +80,7 @@ bool CSubtitleSampleReader::InitializeFile(std::string url)
   // Download the file
   CURL::CUrl curl(url);
   curl.AddHeaders(kodiProps.GetStreamHeaders());
-  int statusCode = curl.Open(true);
+  int statusCode = curl.Open();
   if (statusCode == -1)
   {
     LOG::Log(LOGERROR, "Download failed, internal error: %s", url.c_str());

diff --git a/src/test/KodiStubs.h b/src/test/KodiStubs.h
@@ -52,14 +52,15 @@ typedef enum FilePropertyTypes
 typedef enum OpenFileFlags
 {
   ADDON_READ_TRUNCATED = 0x01,
-  ADDON_READ_CHUNKED = 0x02,
+  ADDON_READ_CHUNKED = 0x02, // deprecated
   ADDON_READ_CACHED = 0x04,
   ADDON_READ_NO_CACHE = 0x08,
   ADDON_READ_BITRATE = 0x10,
   ADDON_READ_MULTI_STREAM = 0x20,
   ADDON_READ_AUDIO_VIDEO = 0x40,
   ADDON_READ_AFTER_WRITE = 0x80,
-  ADDON_READ_REOPEN = 0x100
+  ADDON_READ_REOPEN = 0x100,
+  ADDON_READ_NO_BUFFER = 0x200,
 } OpenFileFlags;
 
 enum AdjustRefreshRateStatus

diff --git a/src/utils/CurlUtils.cpp b/src/utils/CurlUtils.cpp
@@ -220,13 +220,9 @@ UTILS::CURL::CUrl::~CUrl()
   m_file.Close();
 }
 
-int UTILS::CURL::CUrl::Open(bool isMediaStream /* = false */)
+int UTILS::CURL::CUrl::Open()
 {
-  unsigned int flags = ADDON_READ_NO_CACHE | ADDON_READ_CHUNKED;
-  if (isMediaStream)
-    flags |= ADDON_READ_AUDIO_VIDEO;
-
-  if (!m_file.CURLOpen(flags))
+  if (!m_file.CURLOpen(ADDON_READ_NO_CACHE | ADDON_READ_NO_BUFFER))
   {
     LOG::LogF(LOGERROR, "CURLOpen failed");
     return -1;

diff --git a/src/utils/CurlUtils.h b/src/utils/CurlUtils.h
@@ -53,10 +53,9 @@ class ATTR_DLL_LOCAL CUrl
 
  /*!
   * \brief Open the url.
-  * \param isMediaStream Set true if the download is a media stream (audio/video/subtitles)
   * \return Return HTTP status code, or -1 for any internal error
   */
-  int Open(bool isMediaStream = false);
+  int Open();
 
   void AddHeader(std::string_view name, std::string_view value);
   void AddHeaders(const std::map<std::string, std::string>& headers);