summaryrefslogtreecommitdiff
path: root/src/reel_encryptable_asset.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-05 18:41:44 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-05 18:41:44 +0100
commit26c7fc71df9a6207696323e6f62b2020da2a9435 (patch)
tree543ce72f72a9bf21527e41071a6304d903e3f7e0 /src/reel_encryptable_asset.cc
parentca6a4a18769e57dfe2c6896c87db1566e9ecda0d (diff)
Make ReelEncryptableAsset like MXF.
Diffstat (limited to 'src/reel_encryptable_asset.cc')
-rw-r--r--src/reel_encryptable_asset.cc16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/reel_encryptable_asset.cc b/src/reel_encryptable_asset.cc
index f3bd7c66..373dd85c 100644
--- a/src/reel_encryptable_asset.cc
+++ b/src/reel_encryptable_asset.cc
@@ -28,24 +28,14 @@ using boost::shared_ptr;
using boost::optional;
using namespace dcp;
-ReelEncryptableAsset::ReelEncryptableAsset ()
- : ReelAsset ()
-{
-
-}
-
-ReelEncryptableAsset::ReelEncryptableAsset (
- shared_ptr<Asset> asset, optional<string> key_id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point
- )
- : ReelAsset (asset, edit_rate, intrinsic_duration, entry_point)
- , _key_id (key_id)
+ReelEncryptableAsset::ReelEncryptableAsset (optional<string> key_id)
+ : _key_id (key_id)
{
}
ReelEncryptableAsset::ReelEncryptableAsset (shared_ptr<const cxml::Node> node)
- : ReelAsset (node)
- , _key_id (node->optional_string_child ("KeyId"))
+ : _key_id (node->optional_string_child ("KeyId"))
{
if (_key_id && _key_id.get().length() > 9) {
_key_id = _key_id.get().substr (9);