#include "util.h"
#include "config.h"
#include "cross.h"
+#include "server_description.h"
#include "dcpomatic_socket.h"
#include "raw_convert.h"
#include <libcxml/cxml.h>
#include <boost/lambda/lambda.hpp>
+#include <iostream>
#include "i18n.h"
, _search_thread (0)
, _listen_thread (0)
, _stop (false)
+{
+ Config::instance()->Changed.connect (boost::bind (&ServerFinder::config_changed, this, _1));
+}
+
+void
+ServerFinder::start ()
{
_search_thread = new boost::thread (boost::bind (&ServerFinder::search_thread, this));
_listen_thread = new boost::thread (boost::bind (&ServerFinder::listen_thread, this));
- Config::instance()->Changed.connect (boost::bind (&ServerFinder::config_changed, this, _1));
}
ServerFinder::~ServerFinder ()
_stop = true;
_search_condition.notify_all ();
- _search_thread->join ();
+ if (_search_thread) {
+ _search_thread->join ();
+ }
_listen_io_service.stop ();
- _listen_thread->join ();
+ if (_listen_thread) {
+ _listen_thread->join ();
+ }
}
void
if (!server_found (ip) && xml->optional_number_child<int>("Version").get_value_or (0) == SERVER_LINK_VERSION) {
ServerDescription sd (ip, xml->number_child<int> ("Threads"));
{
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_servers_mutex);
_servers.push_back (sd);
}
emit (boost::bind (boost::ref (ServersListChanged)));
bool
ServerFinder::server_found (string ip) const
{
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_servers_mutex);
list<ServerDescription>::const_iterator i = _servers.begin();
while (i != _servers.end() && i->host_name() != ip) {
++i;
{
if (!_instance) {
_instance = new ServerFinder ();
+ _instance->start ();
}
return _instance;
list<ServerDescription>
ServerFinder::servers () const
{
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_servers_mutex);
return _servers;
}
{
if (what == Config::USE_ANY_SERVERS || what == Config::SERVERS) {
{
- boost::mutex::scoped_lock lm (_mutex);
+ boost::mutex::scoped_lock lm (_servers_mutex);
_servers.clear ();
}
ServersListChanged ();