mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 13:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for older versions of libcurl (e.g. those found on RHEL7) that do not have support for the newer CURLOPT_XFERINFODATA / CURLOPT_XFERINFOFUNCTION options.

Browse Source
This commit is contained in:
casey langen 2020-12-05 13:38:39 -08:00
parent dff519ee87
commit c44343712d
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/httpdatastream/HttpDataStream.cpp
View File

@ -327,12 +327,20 @@ bool HttpDataStream::Open(const char *rawUri, OpenFlags flags) {
curl_easy_setopt(this->curlEasy, CURLOPT_FAILONERROR, 1); curl_easy_setopt(this->curlEasy, CURLOPT_FAILONERROR, 1);
curl_easy_setopt(this->curlEasy, CURLOPT_USERAGENT, "musikcube HttpDataStream"); curl_easy_setopt(this->curlEasy, CURLOPT_USERAGENT, "musikcube HttpDataStream");
curl_easy_setopt(this->curlEasy, CURLOPT_NOPROGRESS, 0); curl_easy_setopt(this->curlEasy, CURLOPT_NOPROGRESS, 0);
curl_easy_setopt(this->curlEasy, CURLOPT_WRITEHEADER, this); curl_easy_setopt(this->curlEasy, CURLOPT_WRITEHEADER, this);
curl_easy_setopt(this->curlEasy, CURLOPT_WRITEDATA, this);
curl_easy_setopt(this->curlEasy, CURLOPT_XFERINFODATA, this);
curl_easy_setopt(this->curlEasy, CURLOPT_WRITEFUNCTION, &HttpDataStream::CurlWriteCallback);
curl_easy_setopt(this->curlEasy, CURLOPT_HEADERFUNCTION, &HttpDataStream::CurlReadHeaderCallback); curl_easy_setopt(this->curlEasy, CURLOPT_HEADERFUNCTION, &HttpDataStream::CurlReadHeaderCallback);
curl_easy_setopt(this->curlEasy, CURLOPT_WRITEDATA, this);
curl_easy_setopt(this->curlEasy, CURLOPT_WRITEFUNCTION, &HttpDataStream::CurlWriteCallback);
#if LIBCURL_VERSION_NUM < 0x072000
curl_easy_setopt(this->curlEasy, CURLOPT_PROGRESSDATA, this);
curl_easy_setopt(this->curlEasy, CURLOPT_PROGRESSFUNCTION, &HttpDataStream::LegacyCurlTransferCallback);
#else
curl_easy_setopt(this->curlEasy, CURLOPT_XFERINFODATA, this);
curl_easy_setopt(this->curlEasy, CURLOPT_XFERINFOFUNCTION, &HttpDataStream::CurlTransferCallback); curl_easy_setopt(this->curlEasy, CURLOPT_XFERINFOFUNCTION, &HttpDataStream::CurlTransferCallback);
#endif
const int connectionTimeout = prefs->GetInt(kConnectionTimeoutSecondsKey.c_str(), kDefaultConnectionTimeoutSeconds); const int connectionTimeout = prefs->GetInt(kConnectionTimeoutSecondsKey.c_str(), kDefaultConnectionTimeoutSeconds);
const int readTimeout = prefs->GetInt(kReadTimeoutSecondsKey.c_str(), kDefaultReadTimeoutSeconds); const int readTimeout = prefs->GetInt(kReadTimeoutSecondsKey.c_str(), kDefaultReadTimeoutSeconds);
@ -579,3 +587,16 @@ int HttpDataStream::CurlTransferCallback(
} }
return 0; /* ok! */ return 0; /* ok! */
} }
#if LIBCURL_VERSION_NUM < 0x072000
int HttpDataStream::LegacyCurlTransferCallback(
void *ptr, double downTotal, double downNow, double upTotal, double upNow)
{
return CurlTransferCallback(
ptr,
(curl_off_t) downTotal,
(curl_off_t) downNow,
(curl_off_t) upTotal,
(curl_off_t) upNow);
}
#endif

4
src/plugins/httpdatastream/HttpDataStream.h
View File

@ -91,6 +91,10 @@ class HttpDataStream : public IDataStream {
static size_t CurlReadHeaderCallback(char *buffer, size_t size, size_t nitems, void *userdata); static size_t CurlReadHeaderCallback(char *buffer, size_t size, size_t nitems, void *userdata);
static int CurlTransferCallback(void *ptr, curl_off_t downTotal, curl_off_t downNow, curl_off_t upTotal, curl_off_t upNow); static int CurlTransferCallback(void *ptr, curl_off_t downTotal, curl_off_t downNow, curl_off_t upTotal, curl_off_t upNow);
#if LIBCURL_VERSION_NUM < 0x072000
static int LegacyCurlTransferCallback(void *ptr, double downTotal, double downNow, double upTotal, double upNow);
#endif
std::string originalUri, httpUri, type; std::string originalUri, httpUri, type;
size_t length; size_t length;
std::string filename; std::string filename;