summaryrefslogtreecommitdiff
path: root/src/reel.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-09-19 20:44:42 +0100
committerCarl Hetherington <cth@carlh.net>2013-09-19 20:44:42 +0100
commit8d6c3c9ae554430582dcb016897e87f6d04d5d78 (patch)
tree5b329eeb60fe7372cc89740d4cf8fa1d5fe51614 /src/reel.cc
parent827901db3d834465b1121c9f8041b9faf4923ec9 (diff)
Various encryption-related stuff.
Diffstat (limited to 'src/reel.cc')
-rw-r--r--src/reel.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/reel.cc b/src/reel.cc
index 43c934ea..ffb184ab 100644
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -93,14 +93,14 @@ Reel::encrypted () const
void
Reel::add_kdm (KDM const & kdm)
{
- list<KDMCipher> ciphers = kdm.ciphers ();
+ list<KDMKey> keys = kdm.keys ();
- for (list<KDMCipher>::iterator i = ciphers.begin(); i != ciphers.end(); ++i) {
+ for (list<KDMKey>::iterator i = keys.begin(); i != keys.end(); ++i) {
if (i->key_id() == _main_picture->key_id()) {
- _main_picture->set_kdm_cipher (*i);
+ _main_picture->set_key (i->key ());
}
if (i->key_id() == _main_sound->key_id()) {
- _main_sound->set_kdm_cipher (*i);
+ _main_sound->set_key (i->key ());
}
}
}