Merge.

7 files changed, 24 insertions, 7 deletions

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 7be96ceeb..798afbfc3 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -48,6 +48,7 @@ DCPSubtitleContent::examine (shared_ptr<Job> job, bool calculate_digest)
 {
 	Content::examine (job, calculate_digest);
 	dcp::SubtitleContent sc (path (0), false);
+	_subtitle_language = sc.language ();
 	_length = DCPTime::from_seconds (sc.latest_subtitle_out().to_seconds ());
 }
 
diff --git a/src/lib/player.cc b/src/lib/player.cc
index fabb5b211..396dc9906 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -50,6 +50,8 @@
 #include <stdint.h>
 #include <algorithm>
 
+#include "i18n.h"
+
 #define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
 
 using std::list;
@@ -549,6 +551,12 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting)
 			continue;
 		}
 
+		/* XXX: this will break down if we have multiple subtitle content */
+		ps.language = subtitle_content->subtitle_language();
+		if (ps.language.empty ()) {
+			ps.language = _("Unknown");
+		}
+
 		shared_ptr<SubtitleDecoder> subtitle_decoder = dynamic_pointer_cast<SubtitleDecoder> ((*j)->decoder);
 		ContentTime const from = dcp_to_content_subtitle (*j, time);
 		/* XXX: this video_frame_rate() should be the rate that the subtitle content has been prepared for */
diff --git a/src/lib/player_subtitles.h b/src/lib/player_subtitles.h
index d0a3b4f65..804c87cb9 100644
--- a/src/lib/player_subtitles.h
+++ b/src/lib/player_subtitles.h
@@ -36,7 +36,9 @@ public:
 
 	/** ImageSubtitles, with their rectangles transformed as specified by their content */
 	std::list<ImageSubtitle> image;
-	std::list<dcp::SubtitleString> text; 
+	std::list<dcp::SubtitleString> text;
+
+	std::string language;
 };
 
 #endif
diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index 7792f3ef6..f10fa58b2 100644
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -90,7 +90,7 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr n
 		_subtitle_x_scale = _subtitle_y_scale = node->number_child<float> ("SubtitleScale");
 	}
 
-	_subtitle_language = node->optional_string_child ("SubtitleLanguage");
+	_subtitle_language = node->optional_string_child ("SubtitleLanguage").get_value_or ("");
 }
 
 SubtitleContent::SubtitleContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
@@ -139,9 +139,13 @@ SubtitleContent::as_xml (xmlpp::Node* root) const
 	root->add_child("SubtitleYOffset")->add_child_text (raw_convert<string> (_subtitle_y_offset));
 	root->add_child("SubtitleXScale")->add_child_text (raw_convert<string> (_subtitle_x_scale));
 	root->add_child("SubtitleYScale")->add_child_text (raw_convert<string> (_subtitle_y_scale));
+<<<<<<< HEAD
 	if (_subtitle_language) {
 		root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language.get ());
 	}
+=======
+	root->add_child("SubtitleLanguage")->add_child_text (_subtitle_language);
+>>>>>>> 30a2bb95980d74a33baeb18d18f2e4ac72d66845
 }
 
 void
diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index 39a3f32eb..e74164f77 100644
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -84,10 +84,14 @@ public:
 		return _subtitle_y_scale;
 	}
 
-	boost::optional<std::string> subtitle_language () const {
+	std::string subtitle_language () const {
 		return _subtitle_language;
 	}
 
+protected:
+	/** subtitle language (e.g. "German") or empty if it is not known */
+	std::string _subtitle_language;
+	
 private:
 	friend struct ffmpeg_pts_offset_test;
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 11a4f9d03..eca0b134a 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -615,9 +615,7 @@ Writer::write (PlayerSubtitles subs)
 	}
 	
 	if (!_subtitle_content) {
-		_subtitle_content.reset (
-			new dcp::SubtitleContent (_film->name(), _film->isdcf_metadata().subtitle_language)
-			);
+		_subtitle_content.reset (new dcp::SubtitleContent (_film->name(), subs.language));
 	}
 	
 	for (list<dcp::SubtitleString>::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) {
diff --git a/src/lib/writer.h b/src/lib/writer.h
index f8aeb8c83..5efb14e50 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -94,7 +94,7 @@ public:
 	void write (boost::shared_ptr<const EncodedData>, int, Eyes);
 	void fake_write (int, Eyes);
 	void write (boost::shared_ptr<const AudioBuffers>);
-	void write (PlayerSubtitles);
+	void write (PlayerSubtitles subs);
 	void repeat (int f, Eyes);
 	void finish ();