X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_dcp_test.cc;h=234bf2c79b10bd8dafc5e74f71d2a36c98c22d3e;hb=97e09772b91038e223f16f9bbfd5fdef1a6cd552;hp=66f3af839286ce70657d6db2094068bf692a8046;hpb=59404039618db5d70a2f8fc0cb8c49ae4f8ce527;p=dcpomatic.git

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 66f3af839..234bf2c79 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,12 @@
 
 */
 
+/** @file test/ffmpeg_dcp_test.cc
+ *  @brief Test creation of a very simple DCP from some FFmpegContent (data/test.mp4).
+ *
+ *  Also a quick test of Film::have_dcp ().
+ */
+
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
 #include "lib/film.h"
@@ -27,16 +33,12 @@
 
 using boost::shared_ptr;
 
-/** @file test/ffmpeg_dcp_test.cc
- *  @brief Test scaling and black-padding of images from a still-image source.
- */
-
 BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 {
 	shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
 	film->set_name ("test_film2");
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
-	c->set_ratio (Ratio::from_id ("185"));
+	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	film->examine_and_add_content (c);
 
 	wait_for_jobs ();
@@ -49,16 +51,16 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 	wait_for_jobs ();
 }
 
-/** Test Film::have_dcp().  Requires the output from ffmpeg_dcp_test above */
+/** Briefly test Film::cpls().  Requires the output from ffmpeg_dcp_test above */
 BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
 {
 	boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
 	shared_ptr<Film> f (new Film (p.string ()));
 	f->read_metadata ();
-	BOOST_CHECK (f->have_dcp());
+	BOOST_CHECK (!f->cpls().empty());
 
 	p /= f->dcp_name();
-	p /= f->dcp_video_mxf_filename();
+	p /= f->video_mxf_filename();
 	boost::filesystem::remove (p);
-	BOOST_CHECK (!f->have_dcp ());
+	BOOST_CHECK (f->cpls().empty());
 }