No-op: remove all trailing whitespace.

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index d480602422b0ee1a810cfc74a1e38c0ad575eb1b..87e7fda8a2ab748c42c322e02f89ca19809d46ca 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -40,6 +40,8 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test)
 {
        shared_ptr<Film> film = new_test_film ("player_overlaps_test");
        film->set_container (Ratio::from_id ("185"));
+
+       /* This content is 3s long */
        shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/test.mp4"));
        shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
        shared_ptr<FFmpegContent> C (new FFmpegContent (film, "test/data/test.mp4"));
@@ -49,32 +51,32 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test)
        film->examine_and_add_content (C);
        wait_for_jobs ();
 
-       BOOST_CHECK_EQUAL (A->full_length(), DCPTime (280000));
+       BOOST_CHECK_EQUAL (A->full_length(), DCPTime (288000));
 
        A->set_position (DCPTime::from_seconds (0));
        B->set_position (DCPTime::from_seconds (10));
        C->set_position (DCPTime::from_seconds (20));
 
-       shared_ptr<Player> player = film->make_player ();
+       shared_ptr<Player> player (new Player (film));
 
        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);
 }
 
@@ -86,11 +88,11 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
        shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
        film->set_container (Ratio::from_id ("185"));
        film->set_audio_channels (6);
-       
+
        film->examine_and_add_content (c);
        wait_for_jobs ();
 
-       shared_ptr<Player> player = film->make_player ();
+       shared_ptr<Player> player (new Player (film));
        shared_ptr<AudioBuffers> test = player->get_audio (DCPTime (0), DCPTime::from_seconds (1), true);
        BOOST_CHECK_EQUAL (test->frames(), 48000);
        BOOST_CHECK_EQUAL (test->channels(), film->audio_channels ());