ReelEncryptableAsset -> ReelMXF.

8 files changed, 22 insertions, 22 deletions

diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc
index c72afc6d..9661281d 100644
--- a/src/decrypted_kdm.cc
+++ b/src/decrypted_kdm.cc
@@ -20,7 +20,7 @@
 #include "decrypted_kdm.h"
 #include "decrypted_kdm_key.h"
 #include "encrypted_kdm.h"
-#include "reel_encryptable_asset.h"
+#include "reel_mxf.h"
 #include "reel_asset.h"
 #include "util.h"
 #include "exceptions.h"
@@ -200,7 +200,7 @@ DecryptedKDM::DecryptedKDM (
 {
 	/* Create DecryptedKDMKey objects for each encryptable asset */
 	BOOST_FOREACH(shared_ptr<const ReelAsset> i, cpl->reel_assets ()) {
-		shared_ptr<const ReelEncryptableAsset> mxf = boost::dynamic_pointer_cast<const ReelEncryptableAsset> (i);
+		shared_ptr<const ReelMXF> mxf = boost::dynamic_pointer_cast<const ReelMXF> (i);
 		shared_ptr<const ReelAsset> asset = boost::dynamic_pointer_cast<const ReelAsset> (i);
 		if (asset && mxf) {
 			if (!mxf->key_id ()) {
diff --git a/src/reel_encryptable_asset.cc b/src/reel_mxf.cc
index 373dd85c..f9e8890a 100644
--- a/src/reel_encryptable_asset.cc
+++ b/src/reel_mxf.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include "reel_encryptable_asset.h"
+#include "reel_mxf.h"
 #include "mxf.h"
 #include "dcp_assert.h"
 #include <libcxml/cxml.h>
@@ -28,13 +28,13 @@ using boost::shared_ptr;
 using boost::optional;
 using namespace dcp;
 
-ReelEncryptableAsset::ReelEncryptableAsset (optional<string> key_id)
+ReelMXF::ReelMXF (optional<string> key_id)
 	: _key_id (key_id)
 {
 
 }
 
-ReelEncryptableAsset::ReelEncryptableAsset (shared_ptr<const cxml::Node> node)
+ReelMXF::ReelMXF (shared_ptr<const cxml::Node> node)
 	: _key_id (node->optional_string_child ("KeyId"))
 {
 	if (_key_id && _key_id.get().length() > 9) {
diff --git a/src/reel_encryptable_asset.h b/src/reel_mxf.h
index 60c8ecff..5e8aa84e 100644
--- a/src/reel_encryptable_asset.h
+++ b/src/reel_mxf.h
@@ -17,8 +17,8 @@
 
 */
 
-/** @file  src/reel_encryptable_asset.h
- *  @brief ReelEncryptableAsset
+/** @file  src/reel_mxf.h
+ *  @brief ReelMXF
  */
 
 #ifndef LIBDCP_REEL_ENCRYPTABLE_ASSET_H
@@ -34,15 +34,15 @@ namespace cxml {
 
 namespace dcp {
 
-/** @class ReelEncryptableAsset
+/** @class ReelMXF
  *  @brief Part of a Reel's description which refers to an asset which can be encrypted.
  */
-class ReelEncryptableAsset
+class ReelMXF
 {
 public:
-	ReelEncryptableAsset () {}
-	ReelEncryptableAsset (boost::optional<std::string> key_id);
-	ReelEncryptableAsset (boost::shared_ptr<const cxml::Node>);
+	ReelMXF () {}
+	ReelMXF (boost::optional<std::string> key_id);
+	ReelMXF (boost::shared_ptr<const cxml::Node>);
 
 	/** @return the 4-character key type for this MXF (MDIK, MDAK, etc.) */
 	virtual std::string key_type () const = 0;
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 86630e13..7099d7d2 100644
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -45,7 +45,7 @@ ReelPictureAsset::ReelPictureAsset ()
 
 ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entry_point)
 	: ReelAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point)
-	, ReelEncryptableAsset (asset->key_id())
+	, ReelMXF (asset->key_id())
 	, _frame_rate (asset->frame_rate ())
 	, _screen_aspect_ratio (asset->screen_aspect_ratio ())
 {
@@ -54,7 +54,7 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entr
 
 ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
 	: ReelAsset (node)
-	, ReelEncryptableAsset (node)
+	, ReelMXF (node)
 {
 	_frame_rate = Fraction (node->string_child ("FrameRate"));
 	try {
diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h
index 2acbc282..4feafeb0 100644
--- a/src/reel_picture_asset.h
+++ b/src/reel_picture_asset.h
@@ -24,7 +24,7 @@
 #ifndef LIBDCP_REEL_PICTURE_ASSET_H
 #define LIBDCP_REEL_PICTURE_ASSET_H
 
-#include "reel_encryptable_asset.h"
+#include "reel_mxf.h"
 #include "reel_asset.h"
 #include "picture_asset.h"
 
@@ -33,7 +33,7 @@ namespace dcp {
 /** @class ReelPictureAsset
  *  @brief Part of a Reel's description which refers to a picture asset.
  */
-class ReelPictureAsset : public ReelAsset, public ReelEncryptableAsset
+class ReelPictureAsset : public ReelAsset, public ReelMXF
 {
 public:
 	ReelPictureAsset ();
diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc
index ce26a502..165453ce 100644
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -32,14 +32,14 @@ using namespace dcp;
 
 ReelSoundAsset::ReelSoundAsset (shared_ptr<SoundAsset> asset, int64_t entry_point)
 	: ReelAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point)
-	, ReelEncryptableAsset (asset->key_id())
+	, ReelMXF (asset->key_id())
 {
 
 }
 
 ReelSoundAsset::ReelSoundAsset (shared_ptr<const cxml::Node> node)
 	: ReelAsset (node)
-	, ReelEncryptableAsset (node)
+	, ReelMXF (node)
 {
 	node->ignore_child ("Language");
 	node->done ();
diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h
index 5cea3208..e7358bd0 100644
--- a/src/reel_sound_asset.h
+++ b/src/reel_sound_asset.h
@@ -21,7 +21,7 @@
  *  @brief ReelSoundAsset class.
  */
 
-#include "reel_encryptable_asset.h"
+#include "reel_mxf.h"
 #include "reel_asset.h"
 #include "sound_asset.h"
 #include <boost/shared_ptr.hpp>
@@ -32,7 +32,7 @@ namespace dcp {
 /** @class ReelSoundAsset
  *  @brief Part of a Reel's description which refers to a sound MXF.
  */
-class ReelSoundAsset : public ReelAsset, public ReelEncryptableAsset
+class ReelSoundAsset : public ReelAsset, public ReelMXF
 {
 public:
 	ReelSoundAsset (boost::shared_ptr<dcp::SoundAsset> content, int64_t entry_point);
diff --git a/src/wscript b/src/wscript
index 371f11c4..f54aaa8f 100644
--- a/src/wscript
+++ b/src/wscript
@@ -34,8 +34,8 @@ def build(bld):
              picture_asset_writer.cc
              reel.cc
              reel_asset.cc
-             reel_encryptable_asset.cc
              reel_mono_picture_asset.cc
+             reel_mxf.cc
              reel_picture_asset.cc
              reel_sound_asset.cc
              reel_stereo_picture_asset.cc
@@ -95,8 +95,8 @@ def build(bld):
               rgb_xyz.h
               reel.h
               reel_asset.h
-              reel_encryptable_asset.h
               reel_mono_picture_asset.h
+              reel_mxf.h
               reel_picture_asset.h
               reel_sound_asset.h
               reel_stereo_picture_asset.h