diff options
| -rw-r--r-- | src/reel_atmos_asset.cc | 2 | ||||
| -rw-r--r-- | src/reel_file_asset.cc | 2 | ||||
| -rw-r--r-- | src/reel_file_asset.h | 2 | ||||
| -rw-r--r-- | src/reel_picture_asset.cc | 2 | ||||
| -rw-r--r-- | src/reel_sound_asset.cc | 2 | ||||
| -rw-r--r-- | src/reel_text_asset.cc | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/reel_atmos_asset.cc b/src/reel_atmos_asset.cc index 4d436b5d..1b4b38b1 100644 --- a/src/reel_atmos_asset.cc +++ b/src/reel_atmos_asset.cc @@ -54,7 +54,7 @@ using namespace dcp; ReelAtmosAsset::ReelAtmosAsset (std::shared_ptr<AtmosAsset> asset, int64_t entry_point) - : ReelFileAsset(asset, asset->key_id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point) + : ReelFileAsset(asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point, asset->key_id()) { } diff --git a/src/reel_file_asset.cc b/src/reel_file_asset.cc index 16e536be..9d779f8d 100644 --- a/src/reel_file_asset.cc +++ b/src/reel_file_asset.cc @@ -62,7 +62,7 @@ ReelFileAsset::ReelFileAsset(std::string id, Fraction edit_rate, int64_t intrins } -ReelFileAsset::ReelFileAsset(shared_ptr<Asset> asset, optional<string> key_id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point) +ReelFileAsset::ReelFileAsset(shared_ptr<Asset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point, optional<string> key_id) : ReelAsset(asset->id(), edit_rate, intrinsic_duration, entry_point) , _asset_ref (asset) , _hash (asset->hash()) diff --git a/src/reel_file_asset.h b/src/reel_file_asset.h index 3c5d9fa3..d2dc8fc3 100644 --- a/src/reel_file_asset.h +++ b/src/reel_file_asset.h @@ -54,7 +54,7 @@ class ReelFileAsset : public ReelAsset { public: ReelFileAsset(std::string id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point, boost::optional<std::string> hash, boost::optional<std::string> key_id); - ReelFileAsset(std::shared_ptr<Asset> asset, boost::optional<std::string> key_id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point); + ReelFileAsset(std::shared_ptr<Asset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point, boost::optional<std::string> key_id); explicit ReelFileAsset (std::shared_ptr<const cxml::Node> node); virtual xmlpp::Element* write_to_cpl(xmlpp::Element* node, Standard standard) const override; diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc index 908f1fe0..9104e342 100644 --- a/src/reel_picture_asset.cc +++ b/src/reel_picture_asset.cc @@ -61,7 +61,7 @@ using namespace dcp; ReelPictureAsset::ReelPictureAsset(shared_ptr<PictureAsset> asset, int64_t entry_point) - : ReelFileAsset(asset, asset->key_id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point) + : ReelFileAsset(asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point, asset->key_id()) , _frame_rate (asset->frame_rate ()) , _screen_aspect_ratio (asset->screen_aspect_ratio ()) { diff --git a/src/reel_sound_asset.cc b/src/reel_sound_asset.cc index b23f5133..9e03ae18 100644 --- a/src/reel_sound_asset.cc +++ b/src/reel_sound_asset.cc @@ -60,7 +60,7 @@ ReelSoundAsset::ReelSoundAsset(std::string id, dcp::Fraction edit_rate, int64_t ReelSoundAsset::ReelSoundAsset(shared_ptr<SoundAsset> asset, int64_t entry_point) - : ReelFileAsset(asset, asset->key_id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point) + : ReelFileAsset(asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point, asset->key_id()) { } diff --git a/src/reel_text_asset.cc b/src/reel_text_asset.cc index 6aca1d18..b60a5691 100644 --- a/src/reel_text_asset.cc +++ b/src/reel_text_asset.cc @@ -56,10 +56,10 @@ using namespace dcp; ReelTextAsset::ReelTextAsset(TextType type, std::shared_ptr<TextAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point) : ReelFileAsset ( asset, - dynamic_pointer_cast<SMPTETextAsset>(asset) ? dynamic_pointer_cast<SMPTETextAsset>(asset)->key_id() : boost::none, edit_rate, intrinsic_duration, - entry_point + entry_point, + dynamic_pointer_cast<SMPTETextAsset>(asset) ? dynamic_pointer_cast<SMPTETextAsset>(asset)->key_id() : boost::none ) , _type(type) { |