Fix a few crashes.

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index b9038dcce09fb374ba635553013913a83ac5f438..842c4b3a9f6f54aa1200a7389b1f9597776c4be4 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -35,6 +35,12 @@ using std::cout;
 using std::list;
 using boost::shared_ptr;
 
+static bool
+valid (Content const *)
+{
+       return true;
+}
+
 /** Player::overlaps */
 BOOST_AUTO_TEST_CASE (player_overlaps_test)
 {
@@ -57,25 +63,25 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test)
        B->set_position (DCPTime::from_seconds (10));
        C->set_position (DCPTime::from_seconds (20));
 
-       shared_ptr<Player> player (new Player (film));
+       shared_ptr<Player> player (new Player (film, film->playlist ()));
 
-       list<shared_ptr<Piece> > o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (0), DCPTime::from_seconds (5));
+       list<shared_ptr<Piece> > o = player->overlaps (DCPTime::from_seconds (0), DCPTime::from_seconds (5), &valid);
        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));
+       o = player->overlaps (DCPTime::from_seconds (5), DCPTime::from_seconds (8), &valid);
        BOOST_CHECK_EQUAL (o.size(), 0U);
 
-       o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (12));
+       o = player->overlaps (DCPTime::from_seconds (8), DCPTime::from_seconds (12), &valid);
        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));
+       o = player->overlaps (DCPTime::from_seconds (2), DCPTime::from_seconds (12), &valid);
        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));
+       o = player->overlaps (DCPTime::from_seconds (8), DCPTime::from_seconds (11), &valid);
        BOOST_CHECK_EQUAL (o.size(), 1U);
        BOOST_CHECK_EQUAL (o.front()->content, B);
 }
@@ -88,11 +94,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 (new Player (film));
+       shared_ptr<Player> player (new Player (film, film->playlist ()));
        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 ());
@@ -103,4 +109,3 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
                }
        }
 }
-