Add NamedChannel and use it to hide the never-used channels

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 79ee20cfb791f03b2b402bebb398013bbd4d8ac7..e2e77cce2b757ea2be3514186be7321ebb009088 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -166,6 +166,7 @@ Film::Film (optional<boost::filesystem::path> dir)
        , _user_explicit_container (false)
        , _user_explicit_resolution (false)
        , _name_language (dcp::LanguageTag("en-US"))
+       , _audio_language (dcp::LanguageTag("en-US"))
        , _release_territory (dcp::LanguageTag::RegionSubtag("US"))
        , _version_number (1)
        , _status (dcp::FINAL)
@@ -473,6 +474,7 @@ Film::metadata (bool with_content_paths) const
                root->add_child("ContentVersion")->add_child_text(i);
        }
        root->add_child("NameLanguage")->add_child_text(_name_language.to_string());
+       root->add_child("AudioLanguage")->add_child_text(_audio_language.to_string());
        root->add_child("ReleaseTerritory")->add_child_text(_release_territory.subtag());
        root->add_child("VersionNumber")->add_child_text(raw_convert<string>(_version_number));
        root->add_child("Status")->add_child_text(dcp::status_to_string(_status));
@@ -636,6 +638,10 @@ Film::read_metadata (optional<boost::filesystem::path> path)
        if (name_language) {
                _name_language = dcp::LanguageTag (*name_language);
        }
+       optional<string> audio_language = f.optional_string_child("AudioLanguage");
+       if (audio_language) {
+               _audio_language = dcp::LanguageTag (*audio_language);
+       }
        optional<string> release_territory = f.optional_string_child("ReleaseTerritory");
        if (release_territory) {
                _release_territory = dcp::LanguageTag::RegionSubtag (*release_territory);
@@ -1701,7 +1707,7 @@ Film::subtitle_language () const
 /** @return The names of the channels that audio contents' outputs are passed into;
  *  this is either the DCP or a AudioProcessor.
  */
-vector<string>
+vector<NamedChannel>
 Film::audio_output_names () const
 {
        if (audio_processor ()) {
@@ -1710,10 +1716,12 @@ Film::audio_output_names () const
 
        DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16);
 
-       vector<string> n;
+       vector<NamedChannel> n;
 
        for (int i = 0; i < audio_channels(); ++i) {
-               n.push_back (short_audio_channel_name (i));
+               if (i != 8 && i != 9 && i != 15) {
+                       n.push_back (NamedChannel(short_audio_channel_name(i), i));
+               }
        }
 
        return n;
@@ -1944,6 +1952,14 @@ Film::set_name_language (dcp::LanguageTag lang)
 }
 
 
+void
+Film::set_audio_language (dcp::LanguageTag lang)
+{
+       ChangeSignaller<Film> ch (this, AUDIO_LANGUAGE);
+       _audio_language = lang;
+}
+
+
 void
 Film::set_release_territory (dcp::LanguageTag::RegionSubtag region)
 {