test/data updates.

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index d7a55b57a065d89d34b4de743ddd7a0319e4dfac..aadde36363e0d4bef8f684c0a290d9ab44e76a2b 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -44,9 +44,9 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test)
        shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
        shared_ptr<FFmpegContent> C (new FFmpegContent (film, "test/data/test.mp4"));
 
-       film->examine_and_add_content (A, true);
-       film->examine_and_add_content (B, true);
-       film->examine_and_add_content (C, true);
+       film->examine_and_add_content (A);
+       film->examine_and_add_content (B);
+       film->examine_and_add_content (C);
        wait_for_jobs ();
 
        BOOST_CHECK_EQUAL (A->full_length(), DCPTime (288000));
@@ -58,23 +58,23 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test)
        shared_ptr<Player> player = film->make_player ();
 
        list<shared_ptr<Piece> > o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (0), DCPTime::from_seconds (5));
-       BOOST_CHECK_EQUAL (o.size(), 1);
+       BOOST_CHECK_EQUAL (o.size(), 1U);
        BOOST_CHECK_EQUAL (o.front()->content, A);
 
        o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (5), DCPTime::from_seconds (8));
-       BOOST_CHECK_EQUAL (o.size(), 0);
+       BOOST_CHECK_EQUAL (o.size(), 0U);
 
        o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (12));
-       BOOST_CHECK_EQUAL (o.size(), 1);
+       BOOST_CHECK_EQUAL (o.size(), 1U);
        BOOST_CHECK_EQUAL (o.front()->content, B);
 
        o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (2), DCPTime::from_seconds (12));
-       BOOST_CHECK_EQUAL (o.size(), 2);
+       BOOST_CHECK_EQUAL (o.size(), 2U);
        BOOST_CHECK_EQUAL (o.front()->content, A);
        BOOST_CHECK_EQUAL (o.back()->content, B);
 
        o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (11));
-       BOOST_CHECK_EQUAL (o.size(), 1);
+       BOOST_CHECK_EQUAL (o.size(), 1U);
        BOOST_CHECK_EQUAL (o.front()->content, B);
 }
 
@@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
        film->set_container (Ratio::from_id ("185"));
        film->set_audio_channels (6);
        
-       film->examine_and_add_content (c, true);
+       film->examine_and_add_content (c);
        wait_for_jobs ();
 
        shared_ptr<Player> player = film->make_player ();