summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-09-19 15:07:21 +0100
committerCarl Hetherington <cth@carlh.net>2013-09-19 15:07:21 +0100
commit827901db3d834465b1121c9f8041b9faf4923ec9 (patch)
tree299a162c0a25d989be4553d32c113d8e0ca098fe /src
parent1c24485f58cdb133477b4e1e201ba0acd93ac74e (diff)
Allow SoundAsset to be encrypted.
Diffstat (limited to 'src')
-rw-r--r--src/sound_asset.cc4
-rw-r--r--src/sound_asset.h3
-rw-r--r--src/wscript1
3 files changed, 5 insertions, 3 deletions
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 51f49d0e..29fbc0d7 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -104,8 +104,8 @@ SoundAsset::SoundAsset (string directory, string mxf_name)
_intrinsic_duration = desc.ContainerDuration;
}
-SoundAsset::SoundAsset (string directory, string mxf_name, int fps, int channels, int sampling_rate)
- : MXFAsset (directory, mxf_name, 0, fps, 0, false)
+SoundAsset::SoundAsset (string directory, string mxf_name, int fps, int channels, int sampling_rate, bool encrypted)
+ : MXFAsset (directory, mxf_name, 0, fps, 0, encrypted)
, _channels (channels)
, _sampling_rate (sampling_rate)
{
diff --git a/src/sound_asset.h b/src/sound_asset.h
index b7542c73..cf015c30 100644
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -128,7 +128,8 @@ public:
std::string mxf_name,
int fps,
int channels,
- int sampling_rate
+ int sampling_rate,
+ bool encrypted
);
boost::shared_ptr<SoundAssetWriter> start_write (bool, MXFMetadata const & metadata = MXFMetadata ());
diff --git a/src/wscript b/src/wscript
index 70fd1794..904b367d 100644
--- a/src/wscript
+++ b/src/wscript
@@ -66,6 +66,7 @@ def build(bld):
rec709_linearised_gamma_lut.h
reel.h
argb_frame.h
+ signer.h
signer_chain.h
sound_asset.h
sound_frame.h