Add Reader classes to permit much more efficient DCP reading.

1 files changed, 17 insertions, 12 deletions

diff --git a/test/sound_frame_test.cc b/test/sound_frame_test.cc
index fa7e2103..837cfe32 100644
--- a/test/sound_frame_test.cc
+++ b/test/sound_frame_test.cc
@@ -20,21 +20,25 @@
 #include <boost/test/unit_test.hpp>
 #include "test.h"
 #include "sound_frame.h"
+#include "sound_asset.h"
+#include "sound_asset_reader.h"
 #include "exceptions.h"
 #include <sndfile.h>
 
+using boost::shared_ptr;
+
 BOOST_AUTO_TEST_CASE (sound_frame_test)
 {
 	int const frame_length = 2000;
 	int const channels = 6;
 
-	dcp::SoundFrame frame (
-		private_test / "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV/pcm_95734608-5d47-4d3f-bf5f-9e9186b66afa_.mxf",
-		42,
-		0
+	dcp::SoundAsset asset (
+		private_test / "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV/pcm_95734608-5d47-4d3f-bf5f-9e9186b66afa_.mxf"
 		);
 
-	BOOST_REQUIRE_EQUAL (frame.size(), channels * frame_length * 3);
+	shared_ptr<const dcp::SoundFrame> frame = asset.start_read()->get_frame(42);
+
+	BOOST_REQUIRE_EQUAL (frame->size(), channels * frame_length * 3);
 
 	boost::filesystem::path ref_file = private_test / "data" / "frame.wav";
 	SF_INFO info;
@@ -46,7 +50,7 @@ BOOST_AUTO_TEST_CASE (sound_frame_test)
 	int const read = sf_readf_int (sndfile, ref_data, frame_length);
 	BOOST_REQUIRE_EQUAL (read, frame_length);
 
-	uint8_t const * p = frame.data ();
+	uint8_t const * p = frame->data ();
 	for (int i = 0; i < (frame_length * channels); ++i) {
 		int x = ref_data[i] >> 8;
 		if (x < 0) {
@@ -60,11 +64,12 @@ BOOST_AUTO_TEST_CASE (sound_frame_test)
 
 BOOST_AUTO_TEST_CASE (sound_frame_test2)
 {
-	BOOST_CHECK_THROW (dcp::SoundFrame ("frobozz", 42, 0), dcp::FileError);
-	BOOST_CHECK_THROW (dcp::SoundFrame (
-				   private_test /
-				   "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV/pcm_95734608-5d47-4d3f-bf5f-9e9186b66afa_.mxf",
-				   999999999, 0
-				   ), dcp::DCPReadError
+	BOOST_CHECK_THROW (dcp::SoundAsset("frobozz"), dcp::FileError);
+
+	dcp::SoundAsset asset (
+		private_test /
+		"TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV/pcm_95734608-5d47-4d3f-bf5f-9e9186b66afa_.mxf"
 		);
+
+	BOOST_CHECK_THROW (asset.start_read()->get_frame (99999999), dcp::DCPReadError);
 }