Store subtitle language(s) in Film, and allow setup of those

[dcpomatic.git] / src / lib / film.h

diff --git a/src/lib/film.h b/src/lib/film.h
index 1748057130ee8edbf8c1edfabe154873dd1303cc..4c71c9e1618efabdf9b7ce95f850d551cb1306e7 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -175,9 +175,7 @@ public:
                return _state_version;
        }
 
-       std::string subtitle_language () const;
-
-       std::vector<std::string> audio_output_names () const;
+       std::vector<NamedChannel> audio_output_names () const;
 
        void repeat_content (ContentList, int);
 
@@ -233,13 +231,15 @@ public:
                RATINGS,
                CONTENT_VERSIONS,
                NAME_LANGUAGE,
+               AUDIO_LANGUAGE,
                RELEASE_TERRITORY,
                VERSION_NUMBER,
                STATUS,
                CHAIN,
                DISTRIBUTOR,
                FACILITY,
-               LUMINANCE
+               LUMINANCE,
+               SUBTITLE_LANGUAGES
        };
 
 
@@ -326,8 +326,10 @@ public:
                return _reencode_j2k;
        }
 
+       typedef std::map<dcp::Marker, dcpomatic::DCPTime> Markers;
+
        boost::optional<dcpomatic::DCPTime> marker (dcp::Marker type) const;
-       std::map<dcp::Marker, dcpomatic::DCPTime> markers () const {
+       Markers markers () const {
                return _markers;
        }
 
@@ -343,6 +345,10 @@ public:
                return _name_language;
        }
 
+       dcp::LanguageTag audio_language () const {
+               return _audio_language;
+       }
+
        dcp::LanguageTag::RegionSubtag release_territory () const {
                return _release_territory;
        }
@@ -371,6 +377,10 @@ public:
                return _luminance;
        }
 
+       std::vector<dcp::LanguageTag> subtitle_languages () const {
+               return _subtitle_languages;
+       }
+
        /* SET */
 
        void set_directory (boost::filesystem::path);
@@ -404,6 +414,7 @@ public:
        void set_ratings (std::vector<dcp::Rating> r);
        void set_content_versions (std::vector<std::string> v);
        void set_name_language (dcp::LanguageTag lang);
+       void set_audio_language (dcp::LanguageTag lang);
        void set_release_territory (dcp::LanguageTag::RegionSubtag region);
        void set_version_number (int v);
        void set_status (dcp::Status s);
@@ -411,6 +422,11 @@ public:
        void set_facility (std::string f);
        void set_distributor (std::string d);
        void set_luminance (dcp::Luminance l);
+       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;
 
        /** Emitted when some property has of the Film is about to change or has changed */
        mutable boost::signals2::signal<void (ChangeType, Property)> Change;
@@ -506,6 +522,7 @@ private:
        std::vector<dcp::Rating> _ratings;
        std::vector<std::string> _content_versions;
        dcp::LanguageTag _name_language;
+       dcp::LanguageTag _audio_language;
        dcp::LanguageTag::RegionSubtag _release_territory;
        int _version_number;
        dcp::Status _status;
@@ -513,6 +530,7 @@ private:
        std::string _distributor;
        std::string _facility;
        dcp::Luminance _luminance;
+       std::vector<dcp::LanguageTag> _subtitle_languages;
 
        int _state_version;