X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fupmixer_a_test.cc;h=e0117c73417612486ebbe7c4b7f74fe571cd9d23;hp=4c611c37ed80c9eb2d4f6a14d2b06d6560353e05;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=e669b562937786bf5b771c927cc03a4074b01be8 diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc index 4c611c37e..e0117c734 100644 --- a/test/upmixer_a_test.cc +++ b/test/upmixer_a_test.cc @@ -18,6 +18,8 @@ */ +#include +#include #include "lib/film.h" #include "lib/ratio.h" #include "lib/dcp_content_type.h" @@ -26,12 +28,8 @@ #include "lib/audio_buffers.h" #include "lib/upmixer_a.h" #include "test.h" -#include -#include -#include using boost::shared_ptr; -using boost::make_shared; BOOST_AUTO_TEST_CASE (upmixer_a_test) { @@ -40,7 +38,7 @@ BOOST_AUTO_TEST_CASE (upmixer_a_test) 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 content = make_shared (film, "test/data/white.wav"); + shared_ptr content (new FFmpegContent (film, "test/data/white.wav")); film->examine_and_add_content (content); wait_for_jobs (); @@ -56,7 +54,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 = make_shared (film, film->playlist ()); + shared_ptr player (new Player (film, film->playlist ())); for (DCPTime t; t < film->length(); t += DCPTime::from_seconds (1)) { shared_ptr b = player->get_audio (t, DCPTime::from_seconds (1), true); sf_write_float (L, b->data(0), b->frames());