summaryrefslogtreecommitdiff
path: root/test/silence_padding_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-01 23:58:47 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-01 23:58:47 +0100
commit368832f2ff6837d9029020b41fb97fb148c3be31 (patch)
tree7653ce59c8e5de15d746897efa7640f33a70a32f /test/silence_padding_test.cc
parent2da8a38e3cc9bebfe324a682d8e4da2e8856676a (diff)
Use new libdcp reader interface.
Diffstat (limited to 'test/silence_padding_test.cc')
-rw-r--r--test/silence_padding_test.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 53c5021c3..9791b7172 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -22,18 +22,19 @@
* @brief Test the padding (with silence) of a mono source to a 6-channel DCP.
*/
-#include <boost/test/unit_test.hpp>
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
+#include "lib/dcp_content_type.h"
+#include "lib/ratio.h"
+#include "test.h"
#include <dcp/cpl.h>
#include <dcp/dcp.h>
#include <dcp/sound_asset.h>
#include <dcp/sound_frame.h>
#include <dcp/reel.h>
#include <dcp/reel_sound_asset.h>
-#include "lib/ffmpeg_content.h"
-#include "lib/film.h"
-#include "lib/dcp_content_type.h"
-#include "lib/ratio.h"
-#include "test.h"
+#include <dcp/sound_asset_reader.h>
+#include <boost/test/unit_test.hpp>
using std::string;
using boost::lexical_cast;
@@ -72,7 +73,7 @@ test_silence_padding (int channels)
int frame = 0;
while (n < sound_asset->asset()->intrinsic_duration()) {
- shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->get_frame (frame++);
+ shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->start_read()->get_frame (frame++);
uint8_t const * d = sound_frame->data ();
for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) {