Merge branch 'master' into 12bit

4 files changed, 8 insertions, 2 deletions

diff --git a/src/dcp_time.cc b/src/dcp_time.cc
index d597e3dc..4c16a91a 100644
--- a/src/dcp_time.cc
+++ b/src/dcp_time.cc
@@ -59,12 +59,12 @@ Time::set (double ss)
 	t = (int (round (ss * 1000)) % 1000) / 4;
 	s = floor (ss);
 
-	if (s > 60) {
+	if (s >= 60) {
 		m = s / 60;
 		s -= m * 60;
 	}
 
-	if (m > 60) {
+	if (m >= 60) {
 		h = m / 60;
 		m -= h * 60;
 	}
diff --git a/src/mxf_asset.cc b/src/mxf_asset.cc
index f16fd35b..28ac1933 100644
--- a/src/mxf_asset.cc
+++ b/src/mxf_asset.cc
@@ -123,6 +123,7 @@ MXFAsset::write_to_cpl (xmlpp::Element* node) const
 	if (!_key_id.empty ()) {
 		a->add_child("KeyId")->add_child_text ("urn:uuid:" + _key_id);
 	}
+	a->add_child ("Hash")->add_child_text (digest ());
 }
 
 void
diff --git a/src/signer.cc b/src/signer.cc
index 11cf5eb8..a6978885 100644
--- a/src/signer.cc
+++ b/src/signer.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include <iostream>
 #include <libxml++/libxml++.h>
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/dl.h>
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index a7ec641c..3dfbe7e2 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -78,6 +78,10 @@ public:
 		return _text;
 	}
 
+	void set_text (std::string t) {
+		_text = t;
+	}
+
 	float v_position () const {
 		return _v_position;
 	}