Remove some unused methods.

diff --git a/src/cpl.cc b/src/cpl.cc
index b76e827262354201f69c086a477e8277917ffee2..35a305e5953a1fee3a8d73e8538e26add0a6bf72 100644 (file)
--- 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 431aef7deb88c156ed15bdd031ef8d8006db64da..73ca45bf60bae809174c45714592116574aff849 100644 (file)
--- 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 08a0c93626a23c91a4d712b40d4effebc72949c8..5878fc2ba7ffc5db484e2c74061c05f14e8b52e2 100644 (file)
--- 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 ());
@@ -148,17 +148,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)
 {

diff --git a/src/reel.h b/src/reel.h
index 5bb19eb01020f18ba158d78ca257804d89850a87..584ba5978c11046fc5f4c9d9211d90da6cfa2976 100644 (file)
--- 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 &);