From: Carl Hetherington <cth@carlh.net>
Date: Mon, 25 Apr 2016 08:46:42 +0000 (+0100)
Subject: Save subtitle video frame rates properly; don't cast them to int for TextSubtitleContent.
X-Git-Tag: v2.7.16~7
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=055531be9496a212c86686936198cd1cf10b619d;p=dcpomatic.git

Save subtitle video frame rates properly; don't cast them to int for TextSubtitleContent.
---

diff --git a/ChangeLog b/ChangeLog
index 4a4992039..a2ebe0fb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-25  c.hetherington  <cth@carlh.net>
+
+	* Fix saving of modified video frame rates for subtitle content.
+
 2016-04-25  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.7.15 released.
diff --git a/src/lib/text_subtitle_content.cc b/src/lib/text_subtitle_content.cc
index 2044c3a41..0de219574 100644
--- a/src/lib/text_subtitle_content.cc
+++ b/src/lib/text_subtitle_content.cc
@@ -52,7 +52,7 @@ TextSubtitleContent::TextSubtitleContent (shared_ptr<const Film> film, cxml::Con
 	: Content (film, node)
 	, SubtitleContent (film, node, version)
 	, _length (node->number_child<ContentTime::Type> ("Length"))
-	, _frame_rate (node->optional_number_child<double>("SubtitleFrameRate"))
+	, _frame_rate (node->optional_number_child<double>("SubtitleVideoFrameRate"))
 	, _colour (
 		node->optional_number_child<int>("Red").get_value_or(255),
 		node->optional_number_child<int>("Green").get_value_or(255),
@@ -101,6 +101,9 @@ TextSubtitleContent::as_xml (xmlpp::Node* node) const
 	Content::as_xml (node);
 	SubtitleContent::as_xml (node);
 	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
+	if (_frame_rate) {
+		node->add_child("SubtitleVideoFrameRate")->add_child_text (raw_convert<string> (_frame_rate.get()));
+	}
 	node->add_child("Red")->add_child_text (raw_convert<string> (_colour.r));
 	node->add_child("Green")->add_child_text (raw_convert<string> (_colour.g));
 	node->add_child("Blue")->add_child_text (raw_convert<string> (_colour.b));
@@ -118,7 +121,7 @@ TextSubtitleContent::full_length () const
 }
 
 void
-TextSubtitleContent::set_subtitle_video_frame_rate (int r)
+TextSubtitleContent::set_subtitle_video_frame_rate (double r)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
diff --git a/src/lib/text_subtitle_content.h b/src/lib/text_subtitle_content.h
index ad63a0e7d..2c8e3b1b7 100644
--- a/src/lib/text_subtitle_content.h
+++ b/src/lib/text_subtitle_content.h
@@ -58,7 +58,7 @@ public:
 	}
 
 	double subtitle_video_frame_rate () const;
-	void set_subtitle_video_frame_rate (int r);
+	void set_subtitle_video_frame_rate (double r);
 
 	void set_colour (dcp::Colour);