Merge branch '1.0' into 1.0-vob

[dcpomatic.git] / test / black_fill_test.cc

diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index 2c239e767fcf99bc4856224e5cedb42895b1b332..9e8aa381bbd0cb0832006fe2a7d6108b71699bac 100644 (file)
--- a/test/black_fill_test.cc
+++ b/test/black_fill_test.cc
@@ -18,7 +18,7 @@
 */
 
 #include <boost/test/unit_test.hpp>
-#include "lib/still_image_content.h"
+#include "lib/image_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
@@ -37,9 +37,9 @@ BOOST_AUTO_TEST_CASE (black_fill_test)
        film->set_name ("black_fill_test");
        film->set_container (Ratio::from_id ("185"));
        film->set_sequence_video (false);
-       shared_ptr<StillImageContent> contentA (new StillImageContent (film, "test/data/simple_testcard_640x480.png"));
+       shared_ptr<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
        contentA->set_ratio (Ratio::from_id ("185"));
-       shared_ptr<StillImageContent> contentB (new StillImageContent (film, "test/data/simple_testcard_640x480.png"));
+       shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
        contentB->set_ratio (Ratio::from_id ("185"));
 
        film->examine_and_add_content (contentA);