Add Reader classes to permit much more efficient DCP reading.

1 files changed, 4 insertions, 10 deletions

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index a422e7c4..e870ff0f 100644
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -56,23 +56,17 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
 }
 
 /** Make a picture frame from a 2D (monoscopic) asset.
- *  @param path Path to the asset's MXF file.
+ *  @param reader Reader for the asset's MXF file.
  *  @param n Frame within the asset, not taking EntryPoint into account.
  *  @param c Context for decryption, or 0.
  */
-MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path, int n, ASDCP::AESDecContext* c)
+MonoPictureFrame::MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, ASDCP::AESDecContext* c)
 {
-	ASDCP::JP2K::MXFReader reader;
-	Kumu::Result_t r = reader.OpenRead (path.string().c_str());
-	if (ASDCP_FAILURE (r)) {
-		boost::throw_exception (FileError ("could not open MXF file for reading", path, r));
-	}
-
 	/* XXX: unfortunate guesswork on this buffer size */
 	_buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
 
-	if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer, c))) {
-		boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1 of %2", n, path.string())));
+	if (ASDCP_FAILURE (reader->ReadFrame (n, *_buffer, c))) {
+		boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1", n)));
 	}
 }