Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / lib / encode_server_finder.cc

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index a017a0af1f2613dd98253d1e6f0f35d10c90598b..135a8bce8219539f676e37f18b3e05079f38b46c 100644 (file)
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -28,7 +28,6 @@
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
 #include <boost/lambda/lambda.hpp>
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -40,13 +39,11 @@ using std::cout;
 using boost::shared_ptr;
 using boost::scoped_array;
 using boost::weak_ptr;
-using boost::make_shared;
 
 EncodeServerFinder* EncodeServerFinder::_instance = 0;
 
 EncodeServerFinder::EncodeServerFinder ()
-       : _disabled (false)
-       , _search_thread (0)
+       : _search_thread (0)
        , _listen_thread (0)
        , _stop (false)
 {
@@ -60,21 +57,43 @@ EncodeServerFinder::start ()
        _listen_thread = new boost::thread (boost::bind (&EncodeServerFinder::listen_thread, this));
 }
 
+
 EncodeServerFinder::~EncodeServerFinder ()
+{
+       stop ();
+}
+
+void
+EncodeServerFinder::stop ()
 {
        _stop = true;
 
        _search_condition.notify_all ();
        if (_search_thread) {
-               DCPOMATIC_ASSERT (_search_thread->joinable ());
-               _search_thread->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(_search_thread->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (_search_thread->joinable ()) {
+                       _search_thread->join ();
+               }
        }
+       delete _search_thread;
+       _search_thread = 0;
 
        _listen_io_service.stop ();
        if (_listen_thread) {
-               DCPOMATIC_ASSERT (_listen_thread->joinable ());
-               _listen_thread->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(_listen_thread->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (_listen_thread->joinable ()) {
+                       _listen_thread->join ();
+               }
        }
+       delete _listen_thread;
+       _listen_thread = 0;
+
+       boost::mutex::scoped_lock lm (_servers_mutex);
+       _servers.clear ();
 }
 
 void
@@ -153,7 +172,7 @@ catch (...)
 void
 EncodeServerFinder::start_accept ()
 {
-       shared_ptr<Socket> socket = make_shared<Socket> ();
+       shared_ptr<Socket> socket (new Socket ());
        _listen_acceptor->async_accept (
                socket->socket(),
                boost::bind (&EncodeServerFinder::handle_accept, this, boost::asio::placeholders::error, socket)
@@ -176,7 +195,7 @@ EncodeServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Sock
        socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
 
        string s (buffer.get());
-       shared_ptr<cxml::Document> xml = make_shared<cxml::Document> ("ServerAvailable");
+       shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
        xml->read_string (s);
 
        string const ip = socket->socket().remote_endpoint().address().to_string ();