Maintain frame-snap for position and trim when set_video_frame_rate is called (#1335).

[dcpomatic.git] / test / file_naming_test.cc

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index f4235dec24d76dc375e80cba914e69f524d6a621..bd7efb0d9895102937ce66687829171f27b93cd3 100644 (file)
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -18,6 +18,11 @@
 
 */
 
+/** @file  test/file_naming_test.cc
+ *  @brief Test how files in DCPs are named.
+ *  @ingroup specific
+ */
+
 #include "test.h"
 #include "lib/config.h"
 #include "lib/film.h"
@@ -29,8 +34,26 @@
 using std::string;
 using boost::shared_ptr;
 
+class Keep
+{
+public:
+       Keep ()
+       {
+               _format = Config::instance()->dcp_asset_filename_format ();
+       }
+
+       ~Keep ()
+       {
+               Config::instance()->set_dcp_asset_filename_format (_format);
+       }
+
+private:
+       dcp::NameFormat _format;
+};
+
 BOOST_AUTO_TEST_CASE (file_naming_test)
 {
+       Keep k;
        Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat ("%c"));
 
        shared_ptr<Film> film = new_test_film ("file_naming_test");
@@ -69,6 +92,7 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
 
 BOOST_AUTO_TEST_CASE (file_naming_test2)
 {
+       Keep k;
        Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat ("%c"));
 
        shared_ptr<Film> film = new_test_film ("file_naming_test2");