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 635913cc29ec8d304390389241f18a81fc06cd0c..442ce3d6f4b41377c69874bf45a1ec44e2f90a43 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -31,17 +31,15 @@
 #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>
 #include <boost/scoped_array.hpp>
 #include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
 #include <string>
 #include <vector>
 #include <iostream>
@@ -64,9 +62,9 @@ using boost::thread;
 using boost::bind;
 using boost::scoped_array;
 using boost::optional;
-using boost::make_shared;
 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())
@@ -87,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 ();
+               }
        }
 }
 
@@ -110,7 +116,7 @@ EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st
        socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
 
        string s (buffer.get());
-       shared_ptr<cxml::Document> xml = make_shared<cxml::Document> ("EncodingRequest");
+       shared_ptr<cxml::Document> xml (new cxml::Document ("EncodingRequest"));
        xml->read_string (s);
        /* This is a double-check; the server shouldn't even be on the candidate list
           if it is the wrong version, but it doesn't hurt to make sure here.
@@ -121,7 +127,7 @@ EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st
                return -1;
        }
 
-       shared_ptr<PlayerVideo> pvf = make_shared<PlayerVideo> (xml, socket);
+       shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket));
 
        DCPVideo dcp_video_frame (pvf, xml, _log);
 
@@ -266,7 +272,7 @@ EncodeServer::broadcast_received ()
                if (_verbose) {
                        cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n";
                }
-               shared_ptr<Socket> socket = make_shared<Socket> ();
+               shared_ptr<Socket> socket (new Socket);
                try {
                        socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1));
                        socket->write (xml.length() + 1);