Mostly-merge master.

[dcpomatic.git] / test / seek_zero_test.cc

diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index c20c99ee7372a48c14b39666b3b53f342edf17c6..07f9e3694b15af5d09044975f3f7ab2e765d96b6 100644 (file)
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -41,17 +41,17 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
-       content->set_ratio (Ratio::from_id ("185"));
+       content->set_scale (VideoContentScale (Ratio::from_id ("185")));
        film->examine_and_add_content (content);
        wait_for_jobs ();
 
-       FFmpegDecoder decoder (film, content, true, false);
+       FFmpegDecoder decoder (content, film->log(), true, false, false);
        shared_ptr<DecodedVideo> a = dynamic_pointer_cast<DecodedVideo> (decoder.peek ());
-       decoder.seek (0, true);
+       decoder.seek (ContentTime(), true);
        shared_ptr<DecodedVideo> b = dynamic_pointer_cast<DecodedVideo> (decoder.peek ());
 
        /* a will be after no seek, and b after a seek to zero, which should
           have the same effect.
        */
-       BOOST_CHECK_EQUAL (a->frame, b->frame);
+       BOOST_CHECK_EQUAL (a->content_time, b->content_time);
 }