Fix missing words in properties windows (#874).

[dcpomatic.git] / test / ffmpeg_audio_test.cc

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 2c34c437d4151b140c26937f11bff43f18ce071e..5fe5ea7c7023b110f701bf603ff1cea4597efdbe 100644 (file)
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 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
@@ -28,15 +28,15 @@
 #include <dcp/sound_frame.h>
 #include <dcp/reel_sound_asset.h>
 #include <dcp/reel.h>
-#include "lib/sndfile_content.h"
+#include "lib/ffmpeg_content.h"
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
 #include "lib/ratio.h"
 #include "lib/ffmpeg_content.h"
 #include "test.h"
 
 using std::string;
-using boost::lexical_cast;
 using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
@@ -47,8 +47,8 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
        film->examine_and_add_content (c);
 
        wait_for_jobs ();
-       
-       c->set_scale (VideoContentScale (Ratio::from_id ("185")));
+
+       c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        film->set_container (Ratio::from_id ("185"));
        film->set_audio_channels (6);
@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
        while (n < sound_asset->asset()->intrinsic_duration()) {
                shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->get_frame (frame++);
                uint8_t const * d = sound_frame->data ();
-               
+
                for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) {
 
                        if (sound_asset->asset()->channels() > 0) {
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
                                int const sample = d[i + 2] | (d[i + 3] << 8);
                                BOOST_CHECK_EQUAL (sample, 0);
                        }
-                       
+
                        if (sound_asset->asset()->channels() > 2) {
                                /* Mono input so it will appear on centre */
                                int const sample = d[i + 7] | (d[i + 8] << 8);