diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2017-01-17 13:25:27 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2017-01-17 13:25:27 +0100 |
commit | 7e0cc3b545a5b47a8770e55e5476e9646809a618 (patch) | |
tree | a57127d2f1e8ed14506f47f54e44f1e3028d8214 /platform/android/src/native_map_view.hpp | |
parent | ea273d4e75f51a6cb7a6fc7573c7722e34e730f1 (diff) | |
download | qtlocation-mapboxgl-7e0cc3b545a5b47a8770e55e5476e9646809a618.tar.gz |
[android] introduce generic Peer object for JNI wrappingupstream/7743-nativepeer-defaultfilesource
Diffstat (limited to 'platform/android/src/native_map_view.hpp')
-rwxr-xr-x | platform/android/src/native_map_view.hpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index ea75ef7702..bc1306405f 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -6,7 +6,7 @@ #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/default_thread_pool.hpp> -#include "storage/default_file_source_peer.hpp" +#include "jni/peer.hpp" #include <string> #include <jni.h> @@ -14,13 +14,16 @@ #include <EGL/egl.h> namespace mbgl { + +class DefaultFileSource; + namespace android { class NativeMapView : public mbgl::View, public mbgl::Backend { public: NativeMapView(JNIEnv* env, jobject obj, - jni::Object<DefaultFileSourcePeer> fileSourcePeer, + jni::Object<Peer<DefaultFileSource>> fileSourcePeer, float pixelRatio, int availableProcessors, size_t totalMemory); @@ -101,7 +104,7 @@ private: size_t totalMemory = 0; // Ensure these are initialised last - jni::UniqueObject<DefaultFileSourcePeer> fileSource; + jni::UniqueObject<Peer<DefaultFileSource>> fileSource; mbgl::ThreadPool threadPool; std::unique_ptr<mbgl::Map> map; mbgl::EdgeInsets insets; |