Go back to player having a playlist and not assuming it uses the film's content.

[dcpomatic.git] / test / upmixer_a_test.cc

diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc
index 67e909ed26a9e2d7028232a1db5512301f1d914b..5b7cff7d2fc3eeb1e2b057d497837bcae9fe8858 100644 (file)
--- a/test/upmixer_a_test.cc
+++ b/test/upmixer_a_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -36,8 +36,8 @@ BOOST_AUTO_TEST_CASE (upmixer_a_test)
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
        film->set_name ("frobozz");
+       film->set_audio_processor (AudioProcessor::from_id ("stereo-5.1-upmix-a"));
        shared_ptr<SndfileContent> content (new SndfileContent (film, "test/data/white.wav"));
-       content->set_audio_processor (AudioProcessor::from_id ("stereo-5.1-upmix-a"));
        film->examine_and_add_content (content);
 
        wait_for_jobs ();
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE (upmixer_a_test)
        SNDFILE* Ls = sf_open ("build/test/upmixer_a_test/Ls.wav", SFM_WRITE, &info);
        SNDFILE* Rs = sf_open ("build/test/upmixer_a_test/Rs.wav", SFM_WRITE, &info);
 
-       shared_ptr<Player> player = film->make_player ();
+       shared_ptr<Player> player (new Player (film, film->playlist ()));
        for (DCPTime t; t < film->length(); t += DCPTime::from_seconds (1)) {
                shared_ptr<AudioBuffers> b = player->get_audio (t, DCPTime::from_seconds (1), true);
                sf_write_float (L, b->data(0), b->frames());
@@ -71,10 +71,10 @@ BOOST_AUTO_TEST_CASE (upmixer_a_test)
        sf_close (Ls);
        sf_close (Rs);
 
-       check_file ("test/data/upmixer_a_test/L.wav", "build/test/upmixer_a_test/L.wav");
-       check_file ("test/data/upmixer_a_test/R.wav", "build/test/upmixer_a_test/R.wav");
-       check_file ("test/data/upmixer_a_test/C.wav", "build/test/upmixer_a_test/C.wav");
-       check_file ("test/data/upmixer_a_test/Lfe.wav", "build/test/upmixer_a_test/Lfe.wav");
-       check_file ("test/data/upmixer_a_test/Ls.wav", "build/test/upmixer_a_test/Ls.wav");
-       check_file ("test/data/upmixer_a_test/Rs.wav", "build/test/upmixer_a_test/Rs.wav");
+       check_audio_file ("test/data/upmixer_a_test/L.wav", "build/test/upmixer_a_test/L.wav");
+       check_audio_file ("test/data/upmixer_a_test/R.wav", "build/test/upmixer_a_test/R.wav");
+       check_audio_file ("test/data/upmixer_a_test/C.wav", "build/test/upmixer_a_test/C.wav");
+       check_audio_file ("test/data/upmixer_a_test/Lfe.wav", "build/test/upmixer_a_test/Lfe.wav");
+       check_audio_file ("test/data/upmixer_a_test/Ls.wav", "build/test/upmixer_a_test/Ls.wav");
+       check_audio_file ("test/data/upmixer_a_test/Rs.wav", "build/test/upmixer_a_test/Rs.wav");
 }