diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2017-04-11 17:18:09 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2017-04-24 10:42:10 +0200 |
commit | 197f0ca6b418a27412bfcc7e891ab80949fd8833 (patch) | |
tree | bb7dd2400bfc002dc5794466d3a74d39a80f8b00 /platform/default/default_file_source.cpp | |
parent | eed7dedf030ed71aac6d004becef42dbec5606bf (diff) | |
download | qtlocation-mapboxgl-197f0ca6b418a27412bfcc7e891ab80949fd8833.tar.gz |
[android] use AAssetManager instead of libzip
Diffstat (limited to 'platform/default/default_file_source.cpp')
-rw-r--r-- | platform/default/default_file_source.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp index 20a3eadc8b..27c3950e2a 100644 --- a/platform/default/default_file_source.cpp +++ b/platform/default/default_file_source.cpp @@ -167,9 +167,15 @@ private: DefaultFileSource::DefaultFileSource(const std::string& cachePath, const std::string& assetRoot, uint64_t maximumCacheSize) + : DefaultFileSource(cachePath, std::make_unique<AssetFileSource>(assetRoot), maximumCacheSize) { +} + +DefaultFileSource::DefaultFileSource(const std::string& cachePath, + std::unique_ptr<FileSource>&& assetFileSource_, + uint64_t maximumCacheSize) : thread(std::make_unique<util::Thread<Impl>>(util::ThreadContext{"DefaultFileSource", util::ThreadPriority::Low}, cachePath, maximumCacheSize)), - assetFileSource(std::make_unique<AssetFileSource>(assetRoot)), + assetFileSource(std::move(assetFileSource_)), localFileSource(std::make_unique<LocalFileSource>()) { } |