projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated de_DE translation from Carsten Kurz.
[dcpomatic.git]
/
src
/
tools
/
server_test.cc
diff --git
a/src/tools/server_test.cc
b/src/tools/server_test.cc
index 19b513357af2c216c65a465ebc025d7f03241224..3307d8f5c4ea68a347d69c984406586117132a2c 100644
(file)
--- a/
src/tools/server_test.cc
+++ b/
src/tools/server_test.cc
@@
-17,32
+17,33
@@
*/
*/
-#include <iostream>
-#include <iomanip>
-#include <exception>
-#include <getopt.h>
#include "lib/ratio.h"
#include "lib/film.h"
#include "lib/filter.h"
#include "lib/util.h"
#include "lib/ratio.h"
#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"
#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"
#include "lib/video_decoder.h"
#include "lib/player.h"
#include "lib/player_video.h"
-#include "lib/data.h"
+#include "lib/encode_server_description.h"
+#include <getopt.h>
+#include <iostream>
+#include <iomanip>
+#include <exception>
using std::cout;
using std::cerr;
using std::string;
using std::pair;
using boost::shared_ptr;
using std::cout;
using std::cerr;
using std::string;
using std::pair;
using boost::shared_ptr;
+using dcp::Data;
static shared_ptr<Film> film;
static shared_ptr<Film> film;
-static ServerDescription* server;
+static
Encode
ServerDescription* server;
static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
static int frame_count = 0;
static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
static int frame_count = 0;
@@
-138,7
+139,7
@@
main (int argc, char* argv[])
dcpomatic_setup ();
try {
dcpomatic_setup ();
try {
- server = new ServerDescription (server_host, 1);
+ server = new
Encode
ServerDescription (server_host, 1);
film.reset (new Film (film_dir));
film->read_metadata ();
film.reset (new Film (film_dir));
film->read_metadata ();