diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_server_cli.cc | 31 | ||||
| -rw-r--r-- | src/tools/server_test.cc | 2 |
2 files changed, 17 insertions, 16 deletions
diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc index 237673179..81c553ef7 100644 --- a/src/tools/dcpomatic_server_cli.cc +++ b/src/tools/dcpomatic_server_cli.cc @@ -17,28 +17,29 @@ */ -#include "lib/server.h" -#include <iostream> -#include <stdexcept> -#include <cstring> -#include <vector> -#include <unistd.h> -#include <errno.h> -#include <getopt.h> -#include <boost/array.hpp> -#include <boost/asio.hpp> -#include <boost/algorithm/string.hpp> -#include <boost/thread.hpp> -#include <boost/thread/mutex.hpp> -#include <boost/thread/condition.hpp> #include "lib/config.h" #include "lib/dcp_video.h" #include "lib/exceptions.h" #include "lib/util.h" #include "lib/config.h" #include "lib/image.h" -#include "lib/log.h" +#include "lib/file_log.h" +#include "lib/null_log.h" #include "lib/version.h" +#include "lib/server.h" +#include <boost/array.hpp> +#include <boost/asio.hpp> +#include <boost/algorithm/string.hpp> +#include <boost/thread.hpp> +#include <boost/thread/mutex.hpp> +#include <boost/thread/condition.hpp> +#include <unistd.h> +#include <errno.h> +#include <getopt.h> +#include <iostream> +#include <stdexcept> +#include <cstring> +#include <vector> using std::cerr; using std::string; diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 201761ed5..9e9a01694 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -25,7 +25,7 @@ #include "lib/dcp_video.h" #include "lib/decoder.h" #include "lib/exceptions.h" -#include "lib/log.h" +#include "lib/file_log.h" #include "lib/video_decoder.h" #include "lib/player.h" #include "lib/player_video.h" |