std::shared_ptr

[dcpomatic.git] / test / silence_padding_test.cc

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 070cb235d512cc826c53202540a18a3707d6435d..e1d893ccba4772c90871137f99286524bfb60aee 100644 (file)
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/silence_padding_test.cc
  *  @brief Test the padding (with silence) of a mono source to a 6-channel DCP.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "lib/ffmpeg_content.h"
@@ -39,7 +39,7 @@
 
 using std::string;
 using boost::lexical_cast;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 static void
 test_silence_padding (int channels)
@@ -136,12 +136,12 @@ BOOST_AUTO_TEST_CASE (silence_padding_test)
 BOOST_AUTO_TEST_CASE (silence_padding_test2)
 {
        shared_ptr<Film> film = new_test_film2 ("silence_padding_test2");
-       shared_ptr<FFmpegContent> content (new FFmpegContent(private_data / "cars.mov"));
+       shared_ptr<FFmpegContent> content (new FFmpegContent(TestPaths::private_data() / "cars.mov"));
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs());
 
        film->set_video_frame_rate (24);
-       content->set_trim_start (ContentTime(4003));
+       content->set_trim_start (dcpomatic::ContentTime(4003));
 
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs());