Split audio; builds.

[dcpomatic.git] / test / video_content_scale_test.cc

diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc
index 1acac8a376c5d078887b3cfdb35bdfce45dad979..78f3bf9b0519be8ecda0e4a25b89d2c3dcbae905 100644 (file)
--- a/test/video_content_scale_test.cc
+++ b/test/video_content_scale_test.cc
@@ -20,6 +20,7 @@
 #include <boost/test/unit_test.hpp>
 #include "lib/ffmpeg_content.h"
 #include "lib/ratio.h"
+#include "lib/video_content.h"
 
 using std::list;
 using std::string;
@@ -88,7 +89,7 @@ test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop
        doc->read_string(s.str ());
 
        list<string> notes;
-       shared_ptr<VideoContent> vc (new FFmpegContent (film, doc, 10, notes));
+       shared_ptr<FFmpegContent> vc (new FFmpegContent (film, doc, 10, notes));
 
        optional<VideoContentScale> sc;
        if (ratio) {
@@ -97,9 +98,9 @@ test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop
                sc = VideoContentScale (scale);
        }
 
-       dcp::Size answer = sc.get().size (vc, display_size, film_size);
+       dcp::Size answer = sc.get().size (vc->video, display_size, film_size);
        if (answer != correct) {
-               cerr << "Testing " << vc->video_size().width << "x" << vc->video_size().height << "\n";
+               cerr << "Testing " << vc->video->video_size().width << "x" << vc->video->video_size().height << "\n";
                cerr << "Testing " << display_size.width << "x" << display_size.height << "\n";
                cerr << answer.width << "x" << answer.height << " instead of " << correct.width << "x" << correct.height << "\n";
        }