projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Default to making SMPTE DCPs on new installs.
[dcpomatic.git]
/
src
/
lib
/
json_server.cc
diff --git
a/src/lib/json_server.cc
b/src/lib/json_server.cc
index 3f43a75eb8ee332a53d0a1bac1cb0e2ecc6e1dd0..9c1034a68bf6f26e41df3a15e0d040ead6044f4a 100644
(file)
--- a/
src/lib/json_server.cc
+++ b/
src/lib/json_server.cc
@@
-26,7
+26,7
@@
#include "transcode_job.h"
#include <dcp/raw_convert.h>
#include <boost/asio.hpp>
#include "transcode_job.h"
#include <dcp/raw_convert.h>
#include <boost/asio.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind
/bind
.hpp>
#include <boost/thread.hpp>
#include <iostream>
#include <boost/thread.hpp>
#include <iostream>
@@
-35,8
+35,8
@@
using std::cout;
using std::map;
using std::list;
using boost::thread;
using std::map;
using std::list;
using boost::thread;
-using
boost
::shared_ptr;
-using
boost
::dynamic_pointer_cast;
+using
std
::shared_ptr;
+using
std
::dynamic_pointer_cast;
using boost::asio::ip::tcp;
using dcp::raw_convert;
using boost::asio::ip::tcp;
using dcp::raw_convert;
@@
-52,9
+52,11
@@
enum State {
JSONServer::JSONServer (int port)
{
JSONServer::JSONServer (int port)
{
- thread* t = new thread (boost::bind (&JSONServer::run, this, port));
#ifdef DCPOMATIC_LINUX
#ifdef DCPOMATIC_LINUX
+ thread* t = new thread (boost::bind (&JSONServer::run, this, port));
pthread_setname_np (t->native_handle(), "json-server");
pthread_setname_np (t->native_handle(), "json-server");
+#else
+ new thread (boost::bind (&JSONServer::run, this, port));
#endif
}
#endif
}