From: Carl Hetherington <cth@carlh.net>
Date: Wed, 7 Aug 2013 00:14:30 +0000 (+0100)
Subject: Missing audio asset decryption.
X-Git-Tag: v0.71~1
X-Git-Url: https://main.carlh.net/gitweb/?p=libdcp.git;a=commitdiff_plain;h=973bbb7a8b6290b4f4ee06e7ba7e199254525ca2

Missing audio asset decryption.
---

diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 0901e915..0d829b75 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -300,7 +300,7 @@ shared_ptr<const SoundFrame>
 SoundAsset::get_frame (int n) const
 {
 	/* XXX: should add on entry point here? */
-	return shared_ptr<const SoundFrame> (new SoundFrame (path().string(), n));
+	return shared_ptr<const SoundFrame> (new SoundFrame (path().string(), n, _decryption_context));
 }
 
 shared_ptr<SoundAssetWriter>
diff --git a/src/sound_frame.cc b/src/sound_frame.cc
index c2a10564..77f4c7a8 100644
--- a/src/sound_frame.cc
+++ b/src/sound_frame.cc
@@ -25,7 +25,7 @@
 using namespace std;
 using namespace libdcp;
 
-SoundFrame::SoundFrame (string mxf_path, int n)
+SoundFrame::SoundFrame (string mxf_path, int n, ASDCP::AESDecContext* c)
 {
 	ASDCP::PCM::MXFReader reader;
 	if (ASDCP_FAILURE (reader.OpenRead (mxf_path.c_str()))) {
@@ -35,7 +35,7 @@ SoundFrame::SoundFrame (string mxf_path, int n)
 	/* XXX: unfortunate guesswork on this buffer size */
 	_buffer = new ASDCP::PCM::FrameBuffer (1 * Kumu::Megabyte);
 
-	if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer))) {
+	if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer, c))) {
 		boost::throw_exception (DCPReadError ("could not read audio frame"));
 	}
 }
diff --git a/src/sound_frame.h b/src/sound_frame.h
index ad4f9604..9cb8aa0d 100644
--- a/src/sound_frame.h
+++ b/src/sound_frame.h
@@ -34,7 +34,7 @@ namespace libdcp {
 class SoundFrame
 {
 public:
-	SoundFrame (std::string mxf_path, int n);
+	SoundFrame (std::string mxf_path, int n, ASDCP::AESDecContext *);
 	~SoundFrame ();
 
 	uint8_t const * data () const;