#include "update_checker.h"
#include "version.h"
-#include "safe_stringstream.h"
#include "util.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <curl/curl.h>
#include <boost/algorithm/string.hpp>
using std::vector;
using boost::is_any_of;
using boost::ends_with;
+using dcp::raw_convert;
/** Singleton instance */
UpdateChecker* UpdateChecker::_instance = 0;
, _curl (0)
, _state (NOT_RUN)
, _emits (0)
- , _thread (0)
, _to_do (0)
, _terminate (false)
{
_curl = curl_easy_init ();
- curl_easy_setopt (_curl, CURLOPT_URL, "http://dcpomatic.com/update");
+ curl_easy_setopt (_curl, CURLOPT_URL, "https://dcpomatic.com/update");
curl_easy_setopt (_curl, CURLOPT_WRITEFUNCTION, write_callback_wrapper);
curl_easy_setopt (_curl, CURLOPT_WRITEDATA, this);
curl_easy_setopt (_curl, CURLOPT_TIMEOUT, 20);
void
UpdateChecker::start ()
{
- _thread = new boost::thread (boost::bind (&UpdateChecker::thread, this));
+ _thread = boost::thread (boost::bind (&UpdateChecker::thread, this));
+#ifdef DCPOMATIC_LINUX
+ pthread_setname_np (_thread.native_handle(), "update-checker");
+#endif
}
UpdateChecker::~UpdateChecker ()
{
+ boost::this_thread::disable_interruption dis;
+
{
boost::mutex::scoped_lock lm (_process_mutex);
_terminate = true;
}
_condition.notify_all ();
- if (_thread) {
- DCPOMATIC_ASSERT (_thread->joinable ());
- _thread->join ();
- }
- delete _thread;
+ try {
+ _thread.join ();
+ } catch (...) {}
curl_easy_cleanup (_curl);
delete[] _buffer;
_stable = stable;
}
- if (version_less_than (dcpomatic_version, test)) {
+ if (!test.empty() && version_less_than (dcpomatic_version, test)) {
_test = test;
}