convert DefaultFileSource to use util::Thread<>

This commit is contained in:
Konstantin Käfer
2015-04-10 22:37:27 +02:00
parent bd531b9e08
commit 4c7132337f
30 changed files with 164 additions and 243 deletions

View File

@@ -59,7 +59,7 @@ NativeMapView::NativeMapView(JNIEnv *env, jobject obj_)
: mbgl::View(*this),
fileCache(mbgl::android::cachePath + "/mbgl-cache.db"),
fileSource(fileCache),
map(*this, fileSource) {
map(*this, *fileSource) {
mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::NativeMapView");
assert(env != nullptr);
@@ -145,7 +145,7 @@ void NativeMapView::notify() {
mbgl::Map &NativeMapView::getMap() { return map; }
mbgl::DefaultFileSource &NativeMapView::getFileSource() { return fileSource; }
mbgl::DefaultFileSource &NativeMapView::getFileSource() { return *fileSource; }
bool NativeMapView::inEmulator() {
// Detect if we are in emulator