summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-07-20 20:37:17 +0100
committerCarl Hetherington <cth@carlh.net>2014-07-20 20:37:17 +0100
commita275e10bdf80000b6f3e01ce565f1779a04b9976 (patch)
tree8767c4d0c6595893e1b79d65fe9a510f3587c9fb /src
parentda228f37426ac999f02e03e558acef5501b22361 (diff)
Remove some unused methods.
Diffstat (limited to 'src')
-rw-r--r--src/cpl.cc12
-rw-r--r--src/cpl.h1
-rw-r--r--src/reel.cc13
-rw-r--r--src/reel.h2
4 files changed, 1 insertions, 27 deletions
diff --git a/src/cpl.cc b/src/cpl.cc
index b76e8272..35a305e5 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -232,18 +232,6 @@ CPL::add (DecryptedKDM const & kdm)
}
}
-/** Set a private key for every MXF referenced by this CPL. This will allow the data
- * to be decrypted or encrypted.
- * @param key Key to use.
- */
-void
-CPL::set_mxf_keys (Key key)
-{
- for (list<shared_ptr<Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
- (*i)->set_mxf_keys (key);
- }
-}
-
void
CPL::resolve_refs (list<shared_ptr<Object> > objects)
{
diff --git a/src/cpl.h b/src/cpl.h
index 431aef7d..73ca45bf 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -101,7 +101,6 @@ public:
bool encrypted () const;
- void set_mxf_keys (Key);
void set_metadata (XMLMetadata m) {
_metadata = m;
}
diff --git a/src/reel.cc b/src/reel.cc
index 08a0c936..5878fc2b 100644
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -137,7 +137,7 @@ void
Reel::add (DecryptedKDM const & kdm)
{
list<DecryptedKDMKey> keys = kdm.keys ();
-
+
for (list<DecryptedKDMKey>::iterator i = keys.begin(); i != keys.end(); ++i) {
if (i->id() == _main_picture->key_id()) {
_main_picture->mxf()->set_key (i->key ());
@@ -149,17 +149,6 @@ Reel::add (DecryptedKDM const & kdm)
}
void
-Reel::set_mxf_keys (Key key)
-{
- _main_picture->mxf()->set_key (key);
- if (_main_sound) {
- _main_sound->mxf()->set_key (key);
- }
-
- /* XXX: subtitle asset? */
-}
-
-void
Reel::add (shared_ptr<ReelAsset> asset)
{
shared_ptr<ReelPictureAsset> p = dynamic_pointer_cast<ReelPictureAsset> (asset);
diff --git a/src/reel.h b/src/reel.h
index 5bb19eb0..584ba597 100644
--- a/src/reel.h
+++ b/src/reel.h
@@ -77,8 +77,6 @@ public:
bool encrypted () const;
- void set_mxf_keys (dcp::Key);
-
bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> notes) const;
void add (DecryptedKDM const &);