projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
tools
/
server_test.cc
diff --git
a/src/tools/server_test.cc
b/src/tools/server_test.cc
index 38e4704b751e8882437b8d605e5fbb1415151f21..9b725cb86df7f15fdb34d1449dbbe6a803ae056c 100644
(file)
--- a/
src/tools/server_test.cc
+++ b/
src/tools/server_test.cc
@@
-142,14
+142,14
@@
main (int argc, char* argv[])
dcpomatic_setup ();
dcpomatic_setup ();
- server = new ServerDescription (server_host, 1);
- film.reset (new Film (film_dir));
- film->read_metadata ();
-
- shared_ptr<Player> player = film->make_player ();
- player->disable_audio ();
-
try {
try {
+ server = new ServerDescription (server_host, 1);
+ film.reset (new Film (film_dir));
+ film->read_metadata ();
+
+ shared_ptr<Player> player = film->make_player ();
+ player->disable_audio ();
+
player->Video.connect (boost::bind (process_video, _1, _2, _3, _5));
bool done = false;
while (!done) {
player->Video.connect (boost::bind (process_video, _1, _2, _3, _5));
bool done = false;
while (!done) {