diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-08-16 20:14:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-08-16 21:51:15 +0100 |
| commit | 74a8d26a8907c6e00e29f054178a3425f44e38ed (patch) | |
| tree | fd700ba8471edcbd6e9e6481a3ca1397397a2d5d /test | |
| parent | c2909b61d360510241ef37abd255269bd8aa9526 (diff) | |
Very basics of colour conversion configuration.
Diffstat (limited to 'test')
| -rw-r--r-- | test/client_server_test.cc | 6 | ||||
| -rw-r--r-- | test/test.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 2dc1545d6..d695f96ce 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -29,7 +29,7 @@ using boost::shared_ptr; using boost::thread; void -do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription* description, shared_ptr<EncodedData> locally_encoded) +do_remote_encode (shared_ptr<DCPVideoFrame> frame, shared_ptr<ServerDescription> description, shared_ptr<EncodedData> locally_encoded) { shared_ptr<EncodedData> remotely_encoded; BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description)); @@ -92,11 +92,11 @@ BOOST_AUTO_TEST_CASE (client_server_test) /* Let the server get itself ready */ dcpomatic_sleep (1); - ServerDescription description ("localhost", 2); + shared_ptr<ServerDescription> description (new ServerDescription ("localhost", 2)); list<thread*> threads; for (int i = 0; i < 8; ++i) { - threads.push_back (new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded))); + threads.push_back (new thread (boost::bind (do_remote_encode, frame, description, locally_encoded))); } for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) { diff --git a/test/test.cc b/test/test.cc index 2334523a1..21cf18c76 100644 --- a/test/test.cc +++ b/test/test.cc @@ -46,7 +46,7 @@ struct TestConfig dcpomatic_setup(); Config::instance()->set_num_local_encoding_threads (1); - Config::instance()->set_servers (vector<ServerDescription*> ()); + Config::instance()->set_servers (vector<shared_ptr<ServerDescription> > ()); Config::instance()->set_server_port (61920); Config::instance()->set_default_dci_metadata (DCIMetadata ()); Config::instance()->set_default_container (static_cast<Ratio*> (0)); |