Merge master; fix destruction of Server; some test cleanups.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index f57023836bcf5d38a2dbc4b23b8f635a26d76b5c..32f74a7d2fb62b8243056d11c11b84eeb5eea0b1 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -67,7 +67,7 @@ struct TestConfig
 
                Config::instance()->set_num_local_encoding_threads (1);
                Config::instance()->set_server_port_base (61920);
-               Config::instance()->set_default_dci_metadata (DCIMetadata ());
+               Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
                Config::instance()->set_default_container (static_cast<Ratio*> (0));
                Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
                Config::instance()->set_default_audio_delay (0);
@@ -143,7 +143,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 static void
 note (dcp::NoteType t, string n)
 {
-       if (t == dcp::ERROR) {
+       if (t == dcp::DCP_ERROR) {
                cerr << n << "\n";
        }
 }