Merge.

[dcpomatic.git] / test / play_test.cc

diff --git a/test/play_test.cc b/test/play_test.cc
index f7aa52d6f539f18102a3f68080c59f70d6cc75e7..b950044a81bd3ba8a599c4c76d14d7766d47fabd 100644 (file)
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -23,6 +23,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/player_video_frame.h"
 #include "test.h"
+#include <iostream>
 
 /* This test needs stuff in Player that is only included in debug mode */
 #ifdef DCPOMATIC_DEBUG
@@ -62,7 +63,7 @@ public:
                if (_queue.empty ()) {
                        return optional<Video> ();
                }
-               
+
                Video v = _queue.back ();
                _queue.pop_back ();
                return v;
@@ -87,17 +88,17 @@ BOOST_AUTO_TEST_CASE (play_test)
        film->set_name ("play_test");
 
        shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/red_24.mp4"));
-       film->examine_and_add_content (A, true);
+       film->examine_and_add_content (A);
        wait_for_jobs ();
 
        BOOST_CHECK_EQUAL (A->video_length_after_3d_combine(), 16);
 
        shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/red_30.mp4"));
-       film->examine_and_add_content (B, true);
+       film->examine_and_add_content (B);
        wait_for_jobs ();
 
        BOOST_CHECK_EQUAL (B->video_length_after_3d_combine(), 16);
-       
+
        /* Film should have been set to 25fps */
        BOOST_CHECK_EQUAL (film->video_frame_rate(), 25);
 
@@ -105,7 +106,7 @@ BOOST_AUTO_TEST_CASE (play_test)
        /* A is 16 frames long at 25 fps */
        BOOST_CHECK_EQUAL (B->position(), 16 * TIME_HZ / 25);
 
-       shared_ptr<Player> player = film->make_player ();
+       shared_ptr<Player> player (new Player (film));
        PlayerWrapper wrap (player);
        /* Seek and audio don't get on at the moment */
        player->disable_audio ();