projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Slightly hacky fix to make ImageSequenceDialog actually work.
[dcpomatic.git]
/
src
/
lib
/
server.cc
diff --git
a/src/lib/server.cc
b/src/lib/server.cc
index e7e2a3c5715c7e17b684d5a9dd696b93c8123f6e..c1db1e6ac866d632c62aead5cd71986875a13151 100644
(file)
--- a/
src/lib/server.cc
+++ b/
src/lib/server.cc
@@
-23,6
+23,7
@@
*/
#include "server.h"
*/
#include "server.h"
+#include "util.h"
#include "dcpomatic_socket.h"
#include "image.h"
#include "dcp_video.h"
#include "dcpomatic_socket.h"
#include "image.h"
#include "dcp_video.h"
@@
-35,6
+36,7
@@
#include "compose.hpp"
#include "log.h"
#include <libcxml/cxml.h>
#include "compose.hpp"
#include "log.h"
#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
#include <boost/algorithm/string.hpp>
#include <boost/scoped_array.hpp>
#include <string>
#include <boost/algorithm/string.hpp>
#include <boost/scoped_array.hpp>
#include <string>
@@
-76,6
+78,7
@@
Server::~Server ()
boost::mutex::scoped_lock lm (_worker_mutex);
_terminate = true;
_empty_condition.notify_all ();
boost::mutex::scoped_lock lm (_worker_mutex);
_terminate = true;
_empty_condition.notify_all ();
+ _full_condition.notify_all ();
}
for (vector<boost::thread*>::iterator i = _worker_threads.begin(); i != _worker_threads.end(); ++i) {
}
for (vector<boost::thread*>::iterator i = _worker_threads.begin(); i != _worker_threads.end(); ++i) {