diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-08-08 16:08:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-08-08 16:08:22 +0100 |
| commit | 2dfef716acf1e22fd8dad288906ac0bbd2b19035 (patch) | |
| tree | 5e05757c368a2e1f8e544a5895b685e99215bc5d /src | |
| parent | ee5e932cf0afa1ce24ea5eb0f298be8009cd9689 (diff) | |
| parent | 90dbabe7e6d4a25d003b28a2ed636a1369183b48 (diff) | |
Merge branch 'master' of /home/carl/git/libdcp
Diffstat (limited to 'src')
| -rw-r--r-- | src/sound_asset.cc | 2 | ||||
| -rw-r--r-- | src/sound_frame.cc | 4 | ||||
| -rw-r--r-- | src/sound_frame.h | 2 |
3 files changed, 4 insertions, 4 deletions
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; |