Make ReelAsset the parent of ReelFileAsset.

[libdcp.git] / src / reel_picture_asset.cc

diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 8a8b52197899e991bb679b50759457d798c080bc..ddc6a802eb9017bf5a297109b3322ebe9b00d9de 100644 (file)
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -57,8 +57,8 @@ using namespace dcp;
 
 
 ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entry_point)
-       : ReelAsset (asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
-       , ReelEncryptableAsset (asset, asset->key_id())
+       : ReelFileAsset (asset, asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
+       , ReelEncryptableAsset (asset->key_id())
        , _frame_rate (asset->frame_rate ())
        , _screen_aspect_ratio (asset->screen_aspect_ratio ())
 {
@@ -67,7 +67,7 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entr
 
 
 ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
-       : ReelAsset (node)
+       : ReelFileAsset (node)
        , ReelEncryptableAsset (node)
 {
        _frame_rate = Fraction (node->string_child ("FrameRate"));
@@ -118,7 +118,7 @@ ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
                        );
        }
 
-       write_to_cpl_mxf (asset);
+       write_to_cpl_encryptable (asset);
 
        return asset;
 }
@@ -137,7 +137,7 @@ ReelPictureAsset::equals (shared_ptr<const ReelPictureAsset> other, EqualityOpti
        if (!asset_equals (other, opt, note)) {
                return false;
        }
-       if (!mxf_equals (other, opt, note)) {
+       if (!file_asset_equals (other, opt, note)) {
                return false;
        }