Put subtitle language back into content from the film (#1930).

This also adds the main/additional language flag.

Of all the considerations about how to specify subtitle language,
the most important seems to be that the language specification happens
for the content where the language is; i.e. in the content text tab.

1 files changed, 1 insertions, 8 deletions

diff --git a/src/lib/film.h b/src/lib/film.h
index 9b45fd073..9feb5d0d3 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -184,6 +184,7 @@ public:
 
 	std::list<dcpomatic::DCPTimePeriod> reels () const;
 	std::list<int> mapped_audio_channels () const;
+	std::pair<boost::optional<dcp::LanguageTag>, std::vector<dcp::LanguageTag>> subtitle_languages () const;
 
 	std::string content_summary (dcpomatic::DCPTimePeriod period) const;
 
@@ -376,10 +377,6 @@ public:
 		return _luminance;
 	}
 
-	std::vector<dcp::LanguageTag> subtitle_languages () const {
-		return _subtitle_languages;
-	}
-
 	/* SET */
 
 	void set_directory (boost::filesystem::path);
@@ -421,9 +418,6 @@ public:
 	void set_facility (boost::optional<std::string> f = boost::none);
 	void set_distributor (boost::optional<std::string> d = boost::none);
 	void set_luminance (boost::optional<dcp::Luminance> l = boost::none);
-	void set_subtitle_language (dcp::LanguageTag language);
-	void unset_subtitle_language ();
-	void set_subtitle_languages (std::vector<dcp::LanguageTag> languages);
 
 	void add_ffoc_lfoc (Markers& markers) const;
 
@@ -529,7 +523,6 @@ private:
 	boost::optional<std::string> _distributor;
 	boost::optional<std::string> _facility;
 	boost::optional<dcp::Luminance> _luminance;
-	std::vector<dcp::LanguageTag> _subtitle_languages;
 
 	int _state_version;