Fix assertion failure in AudioBuffers::copy_from() (#1909)

[dcpomatic.git] / test / file_naming_test.cc

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index d0db2f30a4a05743e403d6644a2b29174eeee835..079026cbac85c4db1133668888289f640fe843bd 100644 (file)
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/file_naming_test.cc
  *  @brief Test how files in DCPs are named.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "test.h"
@@ -36,7 +36,7 @@
 #include <boost/regex.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 class Keep
 {
@@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
        b->set_video_frame_rate (24);
        b->video->set_length (24);
 
-       film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
        film->write_metadata ();
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs());
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
        b->set_video_frame_rate (24);
        b->video->set_length (24);
 
-       film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs());
 
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
                boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->file(film->dcp_name()));
                i != boost::filesystem::directory_iterator();
                ++i) {
-               if (boost::regex_match(i->path().string(), boost::regex(".*flt_red\\.png_.*\\.mxf"))) {
+               if (boost::regex_match(i->path().string(), boost::regex(".*flat_red\\.png_.*\\.mxf"))) {
                        ++got[0];
                } else if (boost::regex_match(i->path().string(), boost::regex(".*flat_green\\.png_.*\\.mxf"))) {
                        ++got[1];