summaryrefslogtreecommitdiff
path: root/src/lib/server.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-01-29 00:37:06 +0000
committerCarl Hetherington <cth@carlh.net>2015-01-29 00:37:06 +0000
commitf213fd833a840fc97e3875979ae7dc7cbbc883b1 (patch)
treebf585e448f263668ebaf39d37a8b90757c1dea91 /src/lib/server.cc
parentc58b1a4a478201b76a4f8491fa075cbe476af484 (diff)
Move Socket to dcpomatic_socket.{cc,h}.
Diffstat (limited to 'src/lib/server.cc')
-rw-r--r--src/lib/server.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 0212356f3..32e1e38b2 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -22,15 +22,8 @@
* encoding work, and a class to implement such a server.
*/
-#include <string>
-#include <vector>
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include <boost/scoped_array.hpp>
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
#include "server.h"
-#include "util.h"
+#include "dcpomatic_socket.h"
#include "scaler.h"
#include "image.h"
#include "dcp_video.h"
@@ -39,6 +32,13 @@
#include "player_video.h"
#include "encoded_data.h"
#include "safe_stringstream.h"
+#include <dcp/raw_convert.h>
+#include <libcxml/cxml.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/scoped_array.hpp>
+#include <string>
+#include <vector>
+#include <iostream>
#include "i18n.h"