Update curl to use new API (2/2)
This commit is contained in:
@@ -617,7 +617,7 @@ Mootcher::updateProgress(double dlnow, double dltotal)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
Mootcher::progress_callback(void *caller, double dltotal, double dlnow, double /*ultotal*/, double /*ulnow*/)
|
Mootcher::progress_callback(void *caller, curl_off_t dltotal, curl_off_t dlnow, curl_off_t /*ultotal*/, curl_off_t /*ulnow*/)
|
||||||
{
|
{
|
||||||
// It may seem curious to pass a pointer to an instance of an object to a static
|
// It may seem curious to pass a pointer to an instance of an object to a static
|
||||||
// member function, but we can't use a normal member function as a curl progress callback,
|
// member function, but we can't use a normal member function as a curl progress callback,
|
||||||
|
|||||||
@@ -40,8 +40,6 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
|
||||||
#include <vector>
|
|
||||||
#include <ytkmm/progressbar.h>
|
#include <ytkmm/progressbar.h>
|
||||||
//#include <ctime>
|
//#include <ctime>
|
||||||
|
|
||||||
@@ -101,7 +99,7 @@ private:
|
|||||||
void setcUrlOptions();
|
void setcUrlOptions();
|
||||||
|
|
||||||
static size_t WriteMemoryCallback (void *ptr, size_t size, size_t nmemb, void *data);
|
static size_t WriteMemoryCallback (void *ptr, size_t size, size_t nmemb, void *data);
|
||||||
static int progress_callback (void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
|
static int progress_callback (void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow);
|
||||||
std::string sortMethodString (enum sortMethod sort);
|
std::string sortMethodString (enum sortMethod sort);
|
||||||
std::string getSoundResourceFile (std::string ID);
|
std::string getSoundResourceFile (std::string ID);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user