Rationalise compiler warning setup.

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

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index e79f82b629e197d783f51a8201c05fc3316d6838..61e0b09c58f1a340460791c02c7ead7aef417b8a 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -36,9 +36,12 @@
 #include "dcpomatic_log.h"
 #include "encoded_log_entry.h"
 #include "version.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/foreach.hpp>
@@ -87,13 +90,9 @@ EncodeServer::~EncodeServer ()
                _full_condition.notify_all ();
        }
 
-       BOOST_FOREACH (boost::thread& i, _worker_threads) {
-               try {
-                       i.join ();
-               } catch (...) {
-
-               }
-       }
+       try {
+               _worker_threads.join_all ();
+       } catch (...) {}
 
        {
                boost::mutex::scoped_lock lm (_broadcast.mutex);
@@ -120,6 +119,8 @@ EncodeServer::~EncodeServer ()
 int
 EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, struct timeval& after_encode)
 {
+       Socket::ReadDigestScope ds (socket);
+
        uint32_t length = socket->read_uint32 ();
        scoped_array<char> buffer (new char[length]);
        socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
@@ -138,6 +139,10 @@ EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st
 
        shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket));
 
+       if (!ds.check()) {
+               throw NetworkError ("Checksums do not match");
+       }
+
        DCPVideo dcp_video_frame (pvf, xml);
 
        gettimeofday (&after_read, 0);
@@ -147,6 +152,7 @@ EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st
        gettimeofday (&after_encode, 0);
 
        try {
+               Socket::WriteDigestScope ds (socket);
                socket->write (encoded.size());
                socket->write (encoded.data().get(), encoded.size());
        } catch (std::exception& e) {
@@ -233,9 +239,9 @@ EncodeServer::run ()
        }
 
        for (int i = 0; i < _num_threads; ++i) {
-               _worker_threads.push_back (thread(bind(&EncodeServer::worker_thread, this)));
+               boost::thread* t = _worker_threads.create_thread (bind(&EncodeServer::worker_thread, this));
 #ifdef DCPOMATIC_LINUX
-               pthread_setname_np (_worker_threads.back().native_handle(), "encode-server-worker");
+               pthread_setname_np (t->native_handle(), "encode-server-worker");
 #endif
        }