Get asset ID from the asset.

6 files changed, 7 insertions, 8 deletions

diff --git a/src/reel_atmos_asset.cc b/src/reel_atmos_asset.cc
index ae7be33a..4d436b5d 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->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
+	: ReelFileAsset(asset, asset->key_id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
 {
 
 }
diff --git a/src/reel_file_asset.cc b/src/reel_file_asset.cc
index 65fba353..16e536be 100644
--- a/src/reel_file_asset.cc
+++ b/src/reel_file_asset.cc
@@ -62,8 +62,8 @@ ReelFileAsset::ReelFileAsset(std::string id, Fraction edit_rate, int64_t intrins
 }
 
 
-ReelFileAsset::ReelFileAsset (shared_ptr<Asset> asset, optional<string> key_id, std::string id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
-	: ReelAsset (id, edit_rate, intrinsic_duration, entry_point)
+ReelFileAsset::ReelFileAsset(shared_ptr<Asset> asset, optional<string> key_id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
+	: ReelAsset(asset->id(), edit_rate, intrinsic_duration, entry_point)
 	, _asset_ref (asset)
 	, _hash (asset->hash())
 	, _key_id (key_id)
diff --git a/src/reel_file_asset.h b/src/reel_file_asset.h
index 47910702..3c5d9fa3 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, std::string id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
+	ReelFileAsset(std::shared_ptr<Asset> asset, boost::optional<std::string> key_id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
 	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 9cb36957..908f1fe0 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->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
+	: ReelFileAsset(asset, asset->key_id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
 	, _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 1a79e3bb..b23f5133 100644
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -59,8 +59,8 @@ 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->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
+ReelSoundAsset::ReelSoundAsset(shared_ptr<SoundAsset> asset, int64_t entry_point)
+	: ReelFileAsset(asset, asset->key_id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
 {
 
 }
diff --git a/src/reel_text_asset.cc b/src/reel_text_asset.cc
index c6de58be..6aca1d18 100644
--- a/src/reel_text_asset.cc
+++ b/src/reel_text_asset.cc
@@ -57,7 +57,6 @@ ReelTextAsset::ReelTextAsset(TextType type, std::shared_ptr<TextAsset> asset, Fr
 	: ReelFileAsset (
 		asset,
 		dynamic_pointer_cast<SMPTETextAsset>(asset) ? dynamic_pointer_cast<SMPTETextAsset>(asset)->key_id() : boost::none,
-		asset->id(),
 		edit_rate,
 		intrinsic_duration,
 		entry_point