projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg
[dcpomatic.git]
/
src
/
lib
/
json_server.cc
diff --git
a/src/lib/json_server.cc
b/src/lib/json_server.cc
index 490f9fc5f6b211321c93b2609acbdc8924901c0f..3f43a75eb8ee332a53d0a1bac1cb0e2ecc6e1dd0 100644
(file)
--- a/
src/lib/json_server.cc
+++ b/
src/lib/json_server.cc
@@
-24,7
+24,7
@@
#include "util.h"
#include "film.h"
#include "transcode_job.h"
#include "util.h"
#include "film.h"
#include "transcode_job.h"
-#include
"raw_convert.h"
+#include
<dcp/raw_convert.h>
#include <boost/asio.hpp>
#include <boost/bind.hpp>
#include <boost/thread.hpp>
#include <boost/asio.hpp>
#include <boost/bind.hpp>
#include <boost/thread.hpp>
@@
-38,6
+38,7
@@
using boost::thread;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::asio::ip::tcp;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::asio::ip::tcp;
+using dcp::raw_convert;
#define MAX_LENGTH 512
#define MAX_LENGTH 512
@@
-51,7
+52,10
@@
enum State {
JSONServer::JSONServer (int port)
{
JSONServer::JSONServer (int port)
{
- new thread (boost::bind (&JSONServer::run, this, port));
+ thread* t = new thread (boost::bind (&JSONServer::run, this, port));
+#ifdef DCPOMATIC_LINUX
+ pthread_setname_np (t->native_handle(), "json-server");
+#endif
}
void
}
void