Move raw_convert into libdcp.

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

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index f318da03b5c2878dc5be5f3d30e74244ebcdf57e..442ce3d6f4b41377c69874bf45a1ec44e2f90a43 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -31,11 +31,10 @@
 #include "config.h"
 #include "cross.h"
 #include "player_video.h"
-#include "safe_stringstream.h"
-#include "raw_convert.h"
 #include "compose.hpp"
 #include "log.h"
 #include "encoded_log_entry.h"
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/algorithm/string.hpp>
@@ -65,6 +64,7 @@ using boost::scoped_array;
 using boost::optional;
 using dcp::Size;
 using dcp::Data;
+using dcp::raw_convert;
 
 EncodeServer::EncodeServer (shared_ptr<Log> log, bool verbose, int num_threads)
        : Server (Config::instance()->server_port_base())
@@ -85,15 +85,23 @@ EncodeServer::~EncodeServer ()
        }
 
        BOOST_FOREACH (boost::thread* i, _worker_threads) {
-               DCPOMATIC_ASSERT (i->joinable ());
-               i->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(i->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (i->joinable ()) {
+                       i->join ();
+               }
                delete i;
        }
 
        _broadcast.io_service.stop ();
        if (_broadcast.thread) {
-               DCPOMATIC_ASSERT (_broadcast.thread->joinable ());
-               _broadcast.thread->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(_broadcast.thread->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (_broadcast.thread->joinable ()) {
+                       _broadcast.thread->join ();
+               }
        }
 }