Fix player audio, almost totally broken by a stupid mistake

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

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 87e59de50bc7ca27a14bfcde1d39b109b4e45429..e2b19fb8ee1b758876fac521ae1db2f0e5ad10af 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -160,6 +160,8 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version)
        for (auto i: node->node_children("ContentVersion")) {
                _content_versions.push_back (i->content());
        }
+
+       _active_audio_channels = node->optional_number_child<int>("ActiveAudioChannels");
 }
 
 void
@@ -252,6 +254,8 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
                auto m = as->mapping ();
                m.make_default (film ? film->audio_processor() : 0);
                as->set_mapping (m);
+
+               _active_audio_channels = examiner->active_audio_channels();
        }
 
        if (examiner->has_atmos()) {
@@ -413,6 +417,10 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const
        for (auto i: _content_versions) {
                node->add_child("ContentVersion")->add_child_text(i);
        }
+
+       if (_active_audio_channels) {
+               node->add_child("ActiveAudioChannels")->add_child_text(raw_convert<string>(*_active_audio_channels));
+       }
 }
 
 DCPTime
@@ -862,3 +870,12 @@ DCPContent::check_font_ids()
        add_fonts_from_examiner(text.front(), examiner.fonts());
 }
 
+
+int
+DCPContent::active_audio_channels() const
+{
+       return _active_audio_channels.get_value_or(
+               (audio && audio->stream()) ? audio->stream()->channels() : 0
+               );
+}
+