Take Film pointer out of Content.

[dcpomatic.git] / test / dcp_playback_test.cc

diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 6210ffc337e8e011c7d2cf92ddd0e355e267508f..4bb4d5a5dd67151d8841a4a930a8367b2e1a2cb0 100644 (file)
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -33,11 +33,20 @@ using boost::optional;
 BOOST_AUTO_TEST_CASE (dcp_playback_test)
 {
        shared_ptr<Film> film = new_test_film ("dcp_playback_test");
-       shared_ptr<DCPContent> content (new DCPContent(film, private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
+       shared_ptr<DCPContent> content (new DCPContent(private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
        film->examine_and_add_content (content);
        wait_for_jobs ();
 
-       shared_ptr<Butler> butler (new Butler(shared_ptr<Player>(new Player(film, film->playlist())), shared_ptr<Log>(), AudioMapping(6, 6), 6));
+       shared_ptr<Butler> butler (
+               new Butler(
+                       shared_ptr<Player>(new Player(film, film->playlist())),
+                       shared_ptr<Log>(),
+                       AudioMapping(6, 6),
+                       6,
+                       bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+                       false,
+                       true)
+               );
        float* audio_buffer = new float[2000*6];
        while (true) {
                pair<shared_ptr<PlayerVideo>, DCPTime> p = butler->get_video ();
@@ -46,7 +55,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
                }
                /* assuming DCP is 24fps/48kHz */
                butler->get_audio (audio_buffer, 2000);
-               p.first->image(optional<dcp::NoteHandler>(), bind(&PlayerVideo::always_rgb, _1), true, false);
+               p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true);
        }
        delete[] audio_buffer;
 }