diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-29 20:02:56 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-29 20:02:56 +0000 |
| commit | bfe277e664a03ec47cd6bee7e1b1e4aca6eb38e6 (patch) | |
| tree | 6bdc6fa07f2cde0565c4025ab552f2c0fc9c3b2f /src/lib/server.cc | |
| parent | 6a0da4eb43fc684c0f54a7a3a817a31dc8db7109 (diff) | |
| parent | 27867be66579551018c926ed3339624e463c1b08 (diff) | |
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/server.cc')
| -rw-r--r-- | src/lib/server.cc | 16 |
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" |