Skip to content

Commit cf0c715

Browse files
committed
[CurlUtils] Removed deprecated use of ADDON_READ_CHUNKED
1 parent ea39649 commit cf0c715

File tree

5 files changed

+8
-12
lines changed

5 files changed

+8
-12
lines changed

src/common/AdaptiveStream.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ bool adaptive::AdaptiveStream::DownloadImpl(const DownloadInfo& downloadInfo,
135135
CURL::CUrl curl{url};
136136
curl.AddHeaders(headers);
137137

138-
int statusCode = curl.Open(true);
138+
int statusCode = curl.Open();
139139

140140
if (statusCode == -1)
141141
LOG::Log(LOGERROR, "[AS-%u] Download failed, internal error: %s", clsId, url.c_str());

src/samplereader/SubtitleSampleReader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ bool CSubtitleSampleReader::InitializeFile(std::string url)
8080
// Download the file
8181
CURL::CUrl curl(url);
8282
curl.AddHeaders(kodiProps.GetStreamHeaders());
83-
int statusCode = curl.Open(true);
83+
int statusCode = curl.Open();
8484
if (statusCode == -1)
8585
{
8686
LOG::Log(LOGERROR, "Download failed, internal error: %s", url.c_str());

src/test/KodiStubs.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,15 @@ typedef enum FilePropertyTypes
5252
typedef enum OpenFileFlags
5353
{
5454
ADDON_READ_TRUNCATED = 0x01,
55-
ADDON_READ_CHUNKED = 0x02,
55+
ADDON_READ_CHUNKED = 0x02, // deprecated
5656
ADDON_READ_CACHED = 0x04,
5757
ADDON_READ_NO_CACHE = 0x08,
5858
ADDON_READ_BITRATE = 0x10,
5959
ADDON_READ_MULTI_STREAM = 0x20,
6060
ADDON_READ_AUDIO_VIDEO = 0x40,
6161
ADDON_READ_AFTER_WRITE = 0x80,
62-
ADDON_READ_REOPEN = 0x100
62+
ADDON_READ_REOPEN = 0x100,
63+
ADDON_READ_NO_BUFFER = 0x200,
6364
} OpenFileFlags;
6465

6566
enum AdjustRefreshRateStatus

src/utils/CurlUtils.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,9 @@ UTILS::CURL::CUrl::~CUrl()
220220
m_file.Close();
221221
}
222222

223-
int UTILS::CURL::CUrl::Open(bool isMediaStream /* = false */)
223+
int UTILS::CURL::CUrl::Open()
224224
{
225-
unsigned int flags = ADDON_READ_NO_CACHE | ADDON_READ_CHUNKED;
226-
if (isMediaStream)
227-
flags |= ADDON_READ_AUDIO_VIDEO;
228-
229-
if (!m_file.CURLOpen(flags))
225+
if (!m_file.CURLOpen(ADDON_READ_NO_CACHE | ADDON_READ_NO_BUFFER))
230226
{
231227
LOG::LogF(LOGERROR, "CURLOpen failed");
232228
return -1;

src/utils/CurlUtils.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ class ATTR_DLL_LOCAL CUrl
5353

5454
/*!
5555
* \brief Open the url.
56-
* \param isMediaStream Set true if the download is a media stream (audio/video/subtitles)
5756
* \return Return HTTP status code, or -1 for any internal error
5857
*/
59-
int Open(bool isMediaStream = false);
58+
int Open();
6059

6160
void AddHeader(std::string_view name, std::string_view value);
6261
void AddHeaders(const std::map<std::string, std::string>& headers);

0 commit comments

Comments
 (0)