[core] Use the ResourceTransform instead of callbacks
Based on the actor model, can be considered safer to use since we don't need to worry about object lifetime anymore.
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/actor/actor_ref.hpp>
|
||||
#include <mbgl/storage/file_source.hpp>
|
||||
#include <mbgl/storage/offline.hpp>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
#include <mbgl/util/optional.hpp>
|
||||
|
||||
#include <vector>
|
||||
#include <mutex>
|
||||
@@ -13,6 +15,8 @@ namespace util {
|
||||
template <typename T> class Thread;
|
||||
} // namespace util
|
||||
|
||||
class ResourceTransform;
|
||||
|
||||
class DefaultFileSource : public FileSource {
|
||||
public:
|
||||
/*
|
||||
@@ -40,7 +44,7 @@ public:
|
||||
void setAccessToken(const std::string&);
|
||||
std::string getAccessToken();
|
||||
|
||||
void setResourceTransform(std::function<std::string(Resource::Kind, std::string&&)>);
|
||||
void setResourceTransform(optional<ActorRef<ResourceTransform>>&&);
|
||||
|
||||
std::unique_ptr<AsyncRequest> request(const Resource&, Callback) override;
|
||||
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
#pragma once
|
||||
|
||||
#include <mbgl/actor/actor_ref.hpp>
|
||||
#include <mbgl/storage/file_source.hpp>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
#include <mbgl/util/optional.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
class ResourceTransform;
|
||||
|
||||
class OnlineFileSource : public FileSource {
|
||||
public:
|
||||
OnlineFileSource();
|
||||
@@ -16,9 +20,7 @@ public:
|
||||
void setAccessToken(const std::string& t) { accessToken = t; }
|
||||
std::string getAccessToken() const { return accessToken; }
|
||||
|
||||
using ResourceTransform =
|
||||
std::function<std::unique_ptr<AsyncRequest>(Resource::Kind, std::string&&, std::function<void(std::string&&)>)>;
|
||||
void setResourceTransform(ResourceTransform&& cb);
|
||||
void setResourceTransform(optional<ActorRef<ResourceTransform>>&&);
|
||||
|
||||
std::unique_ptr<AsyncRequest> request(const Resource&, Callback) override;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user