bba3d9838a
Thread<T> is a generic thread management object that starts a thread, creates an object T in that thread and calls its .start() function. When the Thread<T> object is destructed (which must happen in the thread that created it), it'll call the object's .stop() function, and wait for thread termination. The .stop() function must somehow get the thread to terminate. Note that object T's constructor/destructor/start()/stop() must be protected/private, and Thread<T> must be declared as a friend class. All public functions may be called from any thread and are exposed through operator->(). RunLoop encapsulates a libuv runloop and has a facility of dispatching function objects to the thread. It can be used either as a worker thread class by itself, or it can be derived from. This commit converts SQLiteCache to derive from RunLoop and removes the custom code used previously for managing the cache thread.
107 lines
2.8 KiB
C++
107 lines
2.8 KiB
C++
#include <mbgl/mbgl.hpp>
|
|
#include <mbgl/util/std.hpp>
|
|
#include <mbgl/util/uv.hpp>
|
|
#include <mbgl/platform/log.hpp>
|
|
#include <mbgl/platform/platform.hpp>
|
|
#include <mbgl/platform/default/settings_json.hpp>
|
|
#include <mbgl/platform/default/glfw_view.hpp>
|
|
#include <mbgl/storage/default_file_source.hpp>
|
|
#include <mbgl/storage/default/sqlite_cache.hpp>
|
|
#include <mbgl/util/thread.hpp>
|
|
|
|
#include <signal.h>
|
|
#include <getopt.h>
|
|
#include <fstream>
|
|
#include <sstream>
|
|
|
|
|
|
std::unique_ptr<GLFWView> view;
|
|
|
|
void quit_handler(int) {
|
|
if (view) {
|
|
mbgl::Log::Info(mbgl::Event::Setup, "waiting for quit...");
|
|
glfwSetWindowShouldClose(view->window, true);
|
|
glfwPostEmptyEvent();
|
|
} else {
|
|
exit(0);
|
|
}
|
|
}
|
|
|
|
int main(int argc, char *argv[]) {
|
|
int fullscreen_flag = 0;
|
|
std::string style;
|
|
|
|
const struct option long_options[] = {
|
|
{"fullscreen", no_argument, &fullscreen_flag, 'f'},
|
|
{"style", required_argument, 0, 's'},
|
|
{0, 0, 0, 0}
|
|
};
|
|
|
|
while (true) {
|
|
int option_index = 0;
|
|
int opt = getopt_long(argc, argv, "fs:", long_options, &option_index);
|
|
if (opt == -1) break;
|
|
switch (opt)
|
|
{
|
|
case 0:
|
|
if (long_options[option_index].flag != 0)
|
|
break;
|
|
case 'f':
|
|
// handle fullscreen_flag
|
|
break;
|
|
case 's':
|
|
style = std::string("asset://") + std::string(optarg);
|
|
default:
|
|
break;
|
|
}
|
|
|
|
}
|
|
|
|
// sigint handling
|
|
struct sigaction sigIntHandler;
|
|
sigIntHandler.sa_handler = quit_handler;
|
|
sigemptyset(&sigIntHandler.sa_mask);
|
|
sigIntHandler.sa_flags = 0;
|
|
sigaction(SIGINT, &sigIntHandler, NULL);
|
|
|
|
view = mbgl::util::make_unique<GLFWView>();
|
|
|
|
mbgl::util::Thread<mbgl::SQLiteCache> cache("/tmp/mbgl-cache.db");
|
|
mbgl::DefaultFileSource fileSource(cache);
|
|
mbgl::Map map(*view, fileSource);
|
|
|
|
// Load settings
|
|
mbgl::Settings_JSON settings;
|
|
map.setLatLngZoom(mbgl::LatLng(settings.latitude, settings.longitude), settings.zoom);
|
|
map.setBearing(settings.bearing);
|
|
map.setDebug(settings.debug);
|
|
|
|
// Set access token if present
|
|
const char *token = getenv("MAPBOX_ACCESS_TOKEN");
|
|
if (token == nullptr) {
|
|
mbgl::Log::Warning(mbgl::Event::Setup, "no access token set. mapbox.com tiles won't work.");
|
|
} else {
|
|
map.setAccessToken(std::string(token));
|
|
}
|
|
|
|
// Load style
|
|
if (style.empty()) {
|
|
style = std::string("asset://") + std::string("styles/bright-v7.json");
|
|
}
|
|
|
|
map.setStyleURL(style);
|
|
|
|
int ret = view->run();
|
|
|
|
// Save settings
|
|
mbgl::LatLng latLng = map.getLatLng();
|
|
settings.latitude = latLng.latitude;
|
|
settings.longitude = latLng.longitude;
|
|
settings.zoom = map.getZoom();
|
|
settings.bearing = map.getBearing();
|
|
settings.debug = map.getDebug();
|
|
settings.save();
|
|
|
|
return ret;
|
|
}
|