Rename video/audio/subtitle part methods.

[dcpomatic.git] / test / scaling_test.cc

diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index 441af6bf30514ecb2eaaafa58ae7deea3ffdaa16..43f5ed7e786f918478c589f8fec7fa677d5080bc 100644 (file)
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -26,14 +26,15 @@
 #include "lib/ratio.h"
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
 #include "test.h"
 
 using std::string;
 using boost::shared_ptr;
 
-static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> content, string image, string container)
+static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content, string image, string container)
 {
-       content->set_scale (VideoContentScale (Ratio::from_id (image)));
+       content->video->set_scale (VideoContentScale (Ratio::from_id (image)));
        film->set_container (Ratio::from_id (container));
        film->make_dcp ();
 
@@ -63,15 +64,20 @@ BOOST_AUTO_TEST_CASE (scaling_test)
        film->examine_and_add_content (imc);
 
        wait_for_jobs ();
-       
-       imc->set_video_length (ContentTime::from_frames (1, 24));
 
+       imc->video->set_length (1);
+
+       /* F-133: 133 image in a flat container */
        scaling_test_for (film, imc, "133", "185");
+       /* F: flat image in a flat container */
        scaling_test_for (film, imc, "185", "185");
+       /* F-S: scope image in a flat container */
        scaling_test_for (film, imc, "239", "185");
 
+       /* S-133: 133 image in a scope container */
        scaling_test_for (film, imc, "133", "239");
+       /* S-F: flat image in a scope container */
        scaling_test_for (film, imc, "185", "239");
+       /* S: scope image in a scope container */
        scaling_test_for (film, imc, "239", "239");
 }
-