std::shared_ptr

[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 6cdd8ce3cc11adb05062c9fd8fdc8744588e33b5..5a5a2bfb74cd38a6bf3329f362c7b9c43dbee215 100644 (file)
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -27,6 +27,7 @@
 #include "dcpomatic_socket.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+#include <boost/bind/placeholders.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <iostream>
 
@@ -36,18 +37,19 @@ using std::string;
 using std::list;
 using std::vector;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::scoped_array;
-using boost::weak_ptr;
+using std::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::raw_convert;
 
 EncodeServerFinder* EncodeServerFinder::_instance = 0;
 
 EncodeServerFinder::EncodeServerFinder ()
-       : _search_thread (0)
-       , _listen_thread (0)
-       , _stop (false)
+       : _stop (false)
 {
        Config::instance()->Changed.connect (boost::bind (&EncodeServerFinder::config_changed, this, _1));
 }
@@ -55,11 +57,11 @@ EncodeServerFinder::EncodeServerFinder ()
 void
 EncodeServerFinder::start ()
 {
-       _search_thread = new boost::thread (boost::bind (&EncodeServerFinder::search_thread, this));
-       _listen_thread = new boost::thread (boost::bind (&EncodeServerFinder::listen_thread, this));
+       _search_thread = boost::thread (boost::bind(&EncodeServerFinder::search_thread, this));
+       _listen_thread = boost::thread (boost::bind(&EncodeServerFinder::listen_thread, this));
 #ifdef DCPOMATIC_LINUX
-       pthread_setname_np (_search_thread->native_handle(), "encode-server-search");
-       pthread_setname_np (_listen_thread->native_handle(), "encode-server-listen");
+       pthread_setname_np (_search_thread.native_handle(), "encode-server-search");
+       pthread_setname_np (_listen_thread.native_handle(), "encode-server-listen");
 #endif
 }
 
@@ -72,31 +74,19 @@ EncodeServerFinder::~EncodeServerFinder ()
 void
 EncodeServerFinder::stop ()
 {
+       boost::this_thread::disable_interruption dis;
+
        _stop = true;
 
        _search_condition.notify_all ();
-       if (_search_thread) {
-               /* 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;
+       try {
+               _search_thread.join();
+       } catch (...) {}
 
        _listen_io_service.stop ();
-       if (_listen_thread) {
-               /* 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;
+       try {
+               _listen_thread.join ();
+       } catch (...) {}
 
        boost::mutex::scoped_lock lm (_servers_mutex);
        _servers.clear ();
@@ -132,15 +122,10 @@ try
                }
 
                /* Query our `definite' servers (if there are any) */
-               vector<string> servers = Config::instance()->servers ();
-               for (vector<string>::const_iterator i = servers.begin(); i != servers.end(); ++i) {
-                       if (server_found (*i)) {
-                               /* Don't bother asking a server that we already know about */
-                               continue;
-                       }
+               BOOST_FOREACH (string const& i, Config::instance()->servers()) {
                        try {
                                boost::asio::ip::udp::resolver resolver (io_service);
-                               boost::asio::ip::udp::resolver::query query (*i, raw_convert<string> (HELLO_PORT));
+                               boost::asio::ip::udp::resolver::query query (i, raw_convert<string> (HELLO_PORT));
                                boost::asio::ip::udp::endpoint end_point (*resolver.resolve (query));
                                socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
                        } catch (...) {