Improve approximate time reporting a bit (#383).

[dcpomatic.git] / test / silence_padding_test.cc

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index e121065367585665653371e249d3f54b6aa8ac3c..f1136a3f1a91c159fa3a32d3158d8b139822de88 100644 (file)
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -17,20 +17,27 @@
 
 */
 
+#include <boost/test/unit_test.hpp>
 #include <libdcp/cpl.h>
 #include <libdcp/dcp.h>
 #include <libdcp/sound_asset.h>
 #include <libdcp/sound_frame.h>
 #include <libdcp/reel.h>
-#include "sndfile_content.h"
+#include "lib/sndfile_content.h"
+#include "lib/film.h"
+#include "lib/dcp_content_type.h"
+#include "lib/ratio.h"
+#include "test.h"
 
+using std::string;
 using boost::lexical_cast;
+using boost::shared_ptr;
 
 static void test_silence_padding (int channels)
 {
        string const film_name = "silence_padding_test_" + lexical_cast<string> (channels);
        shared_ptr<Film> film = new_test_film (film_name);
-       film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
        film->set_container (Ratio::from_id ("185"));
        film->set_name (film_name);
 
@@ -38,7 +45,7 @@ static void test_silence_padding (int channels)
        film->examine_and_add_content (content);
        wait_for_jobs ();
 
-       film->set_dcp_audio_channels (channels);
+       film->set_audio_channels (channels);
        film->make_dcp ();
        wait_for_jobs ();
 
@@ -108,7 +115,7 @@ static void test_silence_padding (int channels)
 
 BOOST_AUTO_TEST_CASE (silence_padding_test)
 {
-       for (int i = 1; i < MAX_AUDIO_CHANNELS; ++i) {
+       for (int i = 1; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
                test_silence_padding (i);
        }
 }