Set 'i' earlier in name_values.

[dcpomatic.git] / test / file_naming_test.cc

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index bd7efb0d9895102937ce66687829171f27b93cd3..160fc08134416fc6a947e764cc94573df0f4c48e 100644 (file)
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -28,6 +28,7 @@
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/regex.hpp>
 
@@ -58,18 +59,30 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
 
        shared_ptr<Film> film = new_test_film ("file_naming_test");
        film->set_name ("file_naming_test");
+       film->set_video_frame_rate (24);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
-       shared_ptr<FFmpegContent> r (new FFmpegContent (film, "test/data/flat_red.png"));
+       shared_ptr<FFmpegContent> r (new FFmpegContent("test/data/flat_red.png"));
        film->examine_and_add_content (r);
-       shared_ptr<FFmpegContent> g (new FFmpegContent (film, "test/data/flat_green.png"));
+       shared_ptr<FFmpegContent> g (new FFmpegContent("test/data/flat_green.png"));
        film->examine_and_add_content (g);
-       shared_ptr<FFmpegContent> b (new FFmpegContent (film, "test/data/flat_blue.png"));
+       shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
        film->examine_and_add_content (b);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
+       r->set_video_frame_rate (24);
+       r->video->set_length (24);
+       g->set_position (film, dcpomatic::DCPTime::from_seconds(1));
+       g->set_video_frame_rate (24);
+       g->video->set_length (24);
+       b->set_position (film, dcpomatic::DCPTime::from_seconds(2));
+       b->set_video_frame_rate (24);
+       b->video->set_length (24);
 
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       film->write_metadata ();
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        int got[3] = { 0, 0, 0 };
        for (
@@ -98,17 +111,27 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
        shared_ptr<Film> film = new_test_film ("file_naming_test2");
        film->set_name ("file_naming_test2");
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
-       shared_ptr<FFmpegContent> r (new FFmpegContent (film, "test/data/flät_red.png"));
+       shared_ptr<FFmpegContent> r (new FFmpegContent("test/data/flät_red.png"));
        film->examine_and_add_content (r);
-       shared_ptr<FFmpegContent> g (new FFmpegContent (film, "test/data/flat_green.png"));
+       shared_ptr<FFmpegContent> g (new FFmpegContent("test/data/flat_green.png"));
        film->examine_and_add_content (g);
-       shared_ptr<FFmpegContent> b (new FFmpegContent (film, "test/data/flat_blue.png"));
+       shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
        film->examine_and_add_content (b);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
+       r->set_video_frame_rate (24);
+       r->video->set_length (24);
+       g->set_position (film, dcpomatic::DCPTime::from_seconds(1));
+       g->set_video_frame_rate (24);
+       g->video->set_length (24);
+       b->set_position (film, dcpomatic::DCPTime::from_seconds(2));
+       b->set_video_frame_rate (24);
+       b->video->set_length (24);
 
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
        film->make_dcp ();
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        int got[3] = { 0, 0, 0 };
        for (