Re-order some parameters.

4 files changed, 5 insertions, 5 deletions

diff --git a/src/reel_file_asset.cc b/src/reel_file_asset.cc
index f564d8d9..65fba353 100644
--- a/src/reel_file_asset.cc
+++ b/src/reel_file_asset.cc
@@ -52,7 +52,7 @@ using boost::optional;
 using namespace dcp;
 
 
-ReelFileAsset::ReelFileAsset(boost::optional<std::string> key_id, std::string id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point, optional<string> hash)
+ReelFileAsset::ReelFileAsset(std::string id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point, optional<string> hash, boost::optional<std::string> key_id)
 	: ReelAsset(id, edit_rate, intrinsic_duration, entry_point)
 	, _asset_ref(id)
 	, _hash(hash)
diff --git a/src/reel_file_asset.h b/src/reel_file_asset.h
index a109e1ab..47910702 100644
--- a/src/reel_file_asset.h
+++ b/src/reel_file_asset.h
@@ -53,8 +53,8 @@ namespace dcp {
 class ReelFileAsset : public ReelAsset
 {
 public:
-	ReelFileAsset(boost::optional<std::string> key_id, std::string id, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point, boost::optional<std::string> hash);
-	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::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);
 	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_sound_asset.cc b/src/reel_sound_asset.cc
index 8b1bd97a..1a79e3bb 100644
--- a/src/reel_sound_asset.cc
+++ b/src/reel_sound_asset.cc
@@ -53,7 +53,7 @@ using namespace dcp;
 
 
 ReelSoundAsset::ReelSoundAsset(std::string id, dcp::Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point, boost::optional<std::string> hash, boost::optional<std::string> key_id)
-	: ReelFileAsset(key_id, id, edit_rate, intrinsic_duration, entry_point, hash)
+	: ReelFileAsset(id, edit_rate, intrinsic_duration, entry_point, hash, key_id)
 {
 
 }
diff --git a/src/reel_sound_asset.h b/src/reel_sound_asset.h
index c7175a59..57792907 100644
--- a/src/reel_sound_asset.h
+++ b/src/reel_sound_asset.h
@@ -53,7 +53,7 @@ class ReelSoundAsset : public ReelFileAsset
 {
 public:
 	ReelSoundAsset(std::string id, dcp::Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point, boost::optional<std::string> hash, boost::optional<std::string> key_id);
-	ReelSoundAsset (std::shared_ptr<dcp::SoundAsset> content, int64_t entry_point);
+	ReelSoundAsset(std::shared_ptr<dcp::SoundAsset> content, int64_t entry_point);
 	explicit ReelSoundAsset (std::shared_ptr<const cxml::Node>);
 
 	bool can_be_read() const override;