diff options
author | Leith Bade <leith@mapbox.com> | 2014-12-21 15:02:47 +1300 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2014-12-21 15:02:47 +1300 |
commit | df19683b6a871350c9f5ef2576d327ef2033d56c (patch) | |
tree | e27e22d7e06310cc45b705b4b5b7342cd9e9ba42 /include | |
parent | 38e2f9831425e7a6dc2d69bd5fa196a5b7cb836f (diff) | |
parent | 2731b582f24063e339c047635c6d7b2316eb8037 (diff) | |
download | qtlocation-mapboxgl-df19683b6a871350c9f5ef2576d327ef2033d56c.tar.gz |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
Makefile
platform/default/headless_view.cpp
src/mbgl/map/map.cpp
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/map/map.hpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 750dbbe023..854d8c6a95 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -148,7 +148,14 @@ private: // Unconditionally performs a render with the current map state. void render(); - bool async = false; + enum class Mode : uint8_t { + None, // we're not doing any processing + Continuous, // continually updating map + Static, // a once-off static image. + }; + + Mode mode = Mode::None; + std::unique_ptr<uv::loop> loop; std::unique_ptr<uv::worker> workers; std::thread thread; |