diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-08-26 16:10:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-08-26 18:00:28 +0100 |
| commit | dbf43f9113d88245f27493fd5d6950ba142b7f1f (patch) | |
| tree | a8f884bc08421fd507ca249ea9610cadb09b7336 /src/tools | |
| parent | edbdc717041a76b01b77a4495031478082f5882e (diff) | |
Move ServerDescription into its own header.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 7 | ||||
| -rw-r--r-- | src/tools/server_test.cc | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index e10fd3138..7ec081cfa 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -17,13 +17,14 @@ */ -#include <boost/thread.hpp> -#include <wx/taskbar.h> -#include <wx/icon.h> #include "wx/wx_util.h" #include "lib/util.h" #include "lib/server.h" #include "lib/config.h" +#include "lib/log.h" +#include <wx/taskbar.h> +#include <wx/icon.h> +#include <boost/thread.hpp> using std::cout; using std::string; diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 19b513357..201761ed5 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -17,10 +17,6 @@ */ -#include <iostream> -#include <iomanip> -#include <exception> -#include <getopt.h> #include "lib/ratio.h" #include "lib/film.h" #include "lib/filter.h" @@ -34,6 +30,11 @@ #include "lib/player.h" #include "lib/player_video.h" #include "lib/data.h" +#include "lib/server_description.h" +#include <getopt.h> +#include <iostream> +#include <iomanip> +#include <exception> using std::cout; using std::cerr; |