libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-30 12:50:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DLC: Fix build following changes to networking code API

Browse Source
This commit is contained in:
Le Philousophe 2024-06-08 11:14:44 +02:00
parent 3db0eef3d3
commit 7c1b35f84c
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backends/dlc/scummvmcloud.cpp
View File

@ -44,8 +44,8 @@
namespace DLC {
namespace ScummVMCloud {
void ScummVMCloud::jsonCallbackGetAllDLCs(Networking::JsonResponse response) {
Common::JSONValue *json = (Common::JSONValue *)response.value;
void ScummVMCloud::jsonCallbackGetAllDLCs(const Networking::JsonResponse &response) {
const Common::JSONValue *json = response.value;
if (json == nullptr || !json->isObject()) {
return;
}
@ -81,21 +81,21 @@ void ScummVMCloud::jsonCallbackGetAllDLCs(Networking::JsonResponse response) {
DLCMan.refreshDLCList();
}
void ScummVMCloud::errorCallbackGetAllDLCs(Networking::ErrorResponse error) {
void ScummVMCloud::errorCallbackGetAllDLCs(const Networking::ErrorResponse &error) {
warning("JsonRequest Error - getAllDLCs");
}
void ScummVMCloud::getAllDLCs() {
Common::String url("https://scummvm-dlcs-default-rtdb.firebaseio.com/dlcs.json"); // temporary mock api
Networking::JsonCallback callback = new Common::Callback<ScummVMCloud, const Networking::JsonResponse &>(this, &ScummVMCloud::jsonCallbackGetAllDLCs);
Networking::ErrorCallback failureCallback = new Common::Callback<ScummVMCloud, const Networking::ErrorResponse &>(this, &ScummVMCloud::errorCallbackGetAllDLCs);
Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(
new Common::Callback<ScummVMCloud, Networking::JsonResponse>(this, &ScummVMCloud::jsonCallbackGetAllDLCs),
new Common::Callback<ScummVMCloud, Networking::ErrorResponse>(this, &ScummVMCloud::errorCallbackGetAllDLCs),
url);
callback, failureCallback, url);
request->execute();
}
void ScummVMCloud::downloadFileCallback(Networking::DataResponse r) {
void ScummVMCloud::downloadFileCallback(const Networking::DataResponse &r) {
Networking::SessionFileResponse *response = static_cast<Networking::SessionFileResponse *>(r.value);
DLCMan._currentDownloadedSize += response->len;
if (DLCMan._interruptCurrentDownload) {
@ -149,7 +149,7 @@ void ScummVMCloud::downloadFileCallback(Networking::DataResponse r) {
}
}
void ScummVMCloud::errorCallback(Networking::ErrorResponse error) {
void ScummVMCloud::errorCallback(const Networking::ErrorResponse &error) {
// error downloading - start next download in queue
DLCMan._queuedDownloadTasks.front()->state = DLCDesc::kErrorDownloading;
DLCMan._queuedDownloadTasks.pop();
@ -160,9 +160,9 @@ void ScummVMCloud::errorCallback(Networking::ErrorResponse error) {
void ScummVMCloud::startDownloadAsync(const Common::String &id, const Common::String &url) {
Common::String localFile = normalizePath(ConfMan.get("dlcspath") + "/" + id, '/');
_rq = new Networking::SessionRequest(url, localFile,
new Common::Callback<ScummVMCloud, Networking::DataResponse>(this, &ScummVMCloud::downloadFileCallback),
new Common::Callback<ScummVMCloud, Networking::ErrorResponse>(this, &ScummVMCloud::errorCallback));
Networking::DataCallback callback = new Common::Callback<ScummVMCloud, const Networking::DataResponse &>(this, &ScummVMCloud::downloadFileCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<ScummVMCloud, const Networking::ErrorResponse &>(this, &ScummVMCloud::errorCallback);
_rq = new Networking::SessionRequest(url, localFile, callback, failureCallback);
_rq->start();
}

8
backends/dlc/scummvmcloud.h
View File

@ -55,13 +55,13 @@ public:
void addEntryToConfig(Common::Path gamePath);
// callback functions
void jsonCallbackGetAllDLCs(Networking::JsonResponse response);
void jsonCallbackGetAllDLCs(const Networking::JsonResponse &response);
void errorCallbackGetAllDLCs(Networking::ErrorResponse error);
void errorCallbackGetAllDLCs(const Networking::ErrorResponse &error);
void downloadFileCallback(Networking::DataResponse response);
void downloadFileCallback(const Networking::DataResponse &response);
void errorCallback(Networking::ErrorResponse error);
void errorCallback(const Networking::ErrorResponse &error);
};
} // End of namespace ScummVMCloud