diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-12-06 19:59:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-11 11:56:22 +0000 |
| commit | 17df947ac256397311a11894062070f8069c7e75 (patch) | |
| tree | bb84d231ae31cab2e7e4d6546c62fcd88150b4d8 /src/tools/server_test.cc | |
| parent | d499ec381ea5fbbae954531be9d66c9cc723c230 (diff) | |
Rename Server -> EncodeServer, ServerFinder -> EncodeServerFinder, ServerDescription -> EncodeServerDescription.
Diffstat (limited to 'src/tools/server_test.cc')
| -rw-r--r-- | src/tools/server_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index fdfceb567..3307d8f5c 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -21,7 +21,7 @@ #include "lib/film.h" #include "lib/filter.h" #include "lib/util.h" -#include "lib/server.h" +#include "lib/encode_server.h" #include "lib/dcp_video.h" #include "lib/decoder.h" #include "lib/exceptions.h" @@ -29,7 +29,7 @@ #include "lib/video_decoder.h" #include "lib/player.h" #include "lib/player_video.h" -#include "lib/server_description.h" +#include "lib/encode_server_description.h" #include <getopt.h> #include <iostream> #include <iomanip> @@ -43,7 +43,7 @@ using boost::shared_ptr; using dcp::Data; static shared_ptr<Film> film; -static ServerDescription* server; +static EncodeServerDescription* server; static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log")); static int frame_count = 0; @@ -139,7 +139,7 @@ main (int argc, char* argv[]) dcpomatic_setup (); try { - server = new ServerDescription (server_host, 1); + server = new EncodeServerDescription (server_host, 1); film.reset (new Film (film_dir)); film->read_metadata (); |