#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>
#ifdef HAVE_VALGRIND_H
#include <valgrind/memcheck.h>
#endif
using std::cout;
using std::cerr;
using std::fixed;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::thread;
using boost::bind;
using boost::scoped_array;
using boost::optional;
+using dcp::ArrayData;
using dcp::Size;
-using dcp::Data;
using dcp::raw_convert;
EncodeServer::EncodeServer (bool verbose, int num_threads)
EncodeServer::~EncodeServer ()
{
+ boost::this_thread::disable_interruption dis;
+
{
boost::mutex::scoped_lock lm (_mutex);
_terminate = true;
_full_condition.notify_all ();
}
- BOOST_FOREACH (boost::thread* i, _worker_threads) {
- try {
- i->join ();
- } catch (...) {
-
- }
- delete i;
- }
+ try {
+ _worker_threads.join_all ();
+ } catch (...) {}
{
boost::mutex::scoped_lock lm (_broadcast.mutex);
}
_broadcast.io_service.stop ();
- if (_broadcast.thread.joinable()) {
- try {
- _broadcast.thread.join ();
- } catch (...) {
-
- }
- }
+ try {
+ _broadcast.thread.join ();
+ } catch (...) {}
}
/** @param after_read Filled in with gettimeofday() after reading the input from the network.
gettimeofday (&after_read, 0);
- Data encoded = dcp_video_frame.encode_locally ();
+ ArrayData encoded = dcp_video_frame.encode_locally ();
gettimeofday (&after_encode, 0);
try {
Socket::WriteDigestScope ds (socket);
socket->write (encoded.size());
- socket->write (encoded.data().get(), encoded.size());
+ socket->write (encoded.data(), encoded.size());
} catch (std::exception& e) {
cerr << "Send failed; frame " << dcp_video_frame.index() << "\n";
LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index());
}
for (int i = 0; i < _num_threads; ++i) {
- boost::thread* t = new thread(bind(&EncodeServer::worker_thread, this));
- _worker_threads.push_back (t);
#ifdef DCPOMATIC_LINUX
+ boost::thread* t = _worker_threads.create_thread (bind(&EncodeServer::worker_thread, this));
pthread_setname_np (t->native_handle(), "encode-server-worker");
+#else
+ _worker_threads.create_thread (bind(&EncodeServer::worker_thread, this));
#endif
}