Merge master and multifarious hackery.

[dcpomatic.git] / test / dcp_test.cc

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 9312a2067dd7ec115767c6f92f4c5356c0b25001..5a698684beb2f6824deaf6dcb6eaca65741029d1 100644 (file)
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -21,14 +21,14 @@ BOOST_AUTO_TEST_CASE (make_dcp_test)
 {
        shared_ptr<Film> film = new_test_film ("make_dcp_test");
        film->set_name ("test_film2");
-       film->set_content ("../../../test/test.mp4");
-       film->set_format (Format::from_nickname ("Flat"));
+       film->add_content (shared_ptr<FFmpegContent> (new FFmpegContent (film, "../../../test/test.mp4")));
+       film->set_container (Container::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        film->make_dcp ();
        film->write_metadata ();
 
        while (JobManager::instance()->work_to_do ()) {
-               dvdomatic_sleep (1);
+               dcpomatic_sleep (1);
        }
        
        BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
@@ -51,15 +51,14 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test)
 {
        shared_ptr<Film> film = new_test_film ("make_dcp_with_range_test");
        film->set_name ("test_film3");
-       film->set_content ("../../../test/test.mp4");
-       film->examine_content ();
-       film->set_format (Format::from_nickname ("Flat"));
+       film->add_content (shared_ptr<Content> (new FFmpegContent (film, "../../../test/test.mp4")));
+//     film->examine_content ();
+       film->set_container (Container::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
-       film->set_trim_end (42);
        film->make_dcp ();
 
        while (JobManager::instance()->work_to_do() && !JobManager::instance()->errors()) {
-               dvdomatic_sleep (1);
+               dcpomatic_sleep (1);
        }
 
        BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);