Allow configuration of MXF/XML filenames (part of #710).

[dcpomatic.git] / test / reels_test.cc

diff --git a/test/reels_test.cc b/test/reels_test.cc
index ac4fcdd99507ad874b88c00d06408ac58dd6baf5..50b4622e2a33f6c6a0bd509ada4ce1bd87778220 100644 (file)
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -83,27 +84,27 @@ BOOST_AUTO_TEST_CASE (reels_test2)
        shared_ptr<Film> film = new_test_film ("reels_test2");
        film->set_name ("reels_test2");
        film->set_container (Ratio::from_id ("185"));
-       film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 
        {
                shared_ptr<ImageContent> c (new ImageContent (film, "test/data/flat_red.png"));
                film->examine_and_add_content (c);
                wait_for_jobs ();
-               c->video->set_video_length (24);
+               c->video->set_length (24);
        }
 
        {
                shared_ptr<ImageContent> c (new ImageContent (film, "test/data/flat_green.png"));
                film->examine_and_add_content (c);
                wait_for_jobs ();
-               c->video->set_video_length (24);
+               c->video->set_length (24);
        }
 
        {
                shared_ptr<ImageContent> c (new ImageContent (film, "test/data/flat_blue.png"));
                film->examine_and_add_content (c);
                wait_for_jobs ();
-               c->video->set_video_length (24);
+               c->video->set_length (24);
        }
 
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
@@ -117,7 +118,7 @@ BOOST_AUTO_TEST_CASE (reels_test2)
        shared_ptr<Film> film2 = new_test_film ("reels_test2b");
        film2->set_name ("reels_test2b");
        film2->set_container (Ratio::from_id ("185"));
-       film2->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+       film2->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        film2->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
 
        shared_ptr<DCPContent> c (new DCPContent (film2, film->dir (film->dcp_name ())));
@@ -151,7 +152,7 @@ BOOST_AUTO_TEST_CASE (reels_test3)
        shared_ptr<Film> film = new_test_film ("reels_test3");
        film->set_name ("reels_test3");
        film->set_container (Ratio::from_id ("185"));
-       film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
 
        shared_ptr<Content> dcp (new DCPContent (film, "test/data/reels_test2"));
@@ -184,7 +185,7 @@ BOOST_AUTO_TEST_CASE (reels_test4)
        shared_ptr<Film> film = new_test_film ("reels_test4");
        film->set_name ("reels_test4");
        film->set_container (Ratio::from_id ("185"));
-       film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
 
        /* 4 piece of 1s-long content */
@@ -193,7 +194,7 @@ BOOST_AUTO_TEST_CASE (reels_test4)
                content[i].reset (new ImageContent (film, "test/data/flat_green.png"));
                film->examine_and_add_content (content[i]);
                wait_for_jobs ();
-               content[i]->video->set_video_length (24);
+               content[i]->video->set_length (24);
        }
 
        shared_ptr<TextSubtitleContent> subs (new TextSubtitleContent (film, "test/data/subrip3.srt"));