Fix failure to update project-wide audio level plot when content moves.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index a9ac82b5a227224a1a01ea97c074f4028ac94a67..0b717738d09bfacd7198b870003869123dd7edb7 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -168,10 +168,8 @@ 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"))
        , _version_number (1)
        , _status (dcp::Status::FINAL)
-       , _luminance (dcp::Luminance(4.5, dcp::Luminance::Unit::FOOT_LAMBERT))
        , _state_version (current_state_version)
        , _dirty (false)
        , _tolerant (false)
@@ -286,13 +284,13 @@ Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
        auto p = dir ("analysis");
 
        Digester digester;
-       for (auto i: playlist->content ()) {
+       for (auto i: playlist->content()) {
                if (!i->audio) {
                        continue;
                }
 
-               digester.add (i->digest ());
-               digester.add (i->audio->mapping().digest ());
+               digester.add (i->digest());
+               digester.add (i->audio->mapping().digest());
                if (playlist->content().size() != 1) {
                        /* Analyses should be considered equal regardless of gain
                           if they were made from just one piece of content.  This
@@ -300,7 +298,14 @@ Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
                           analysis at the plotting stage rather than having to
                           recompute it.
                        */
-                       digester.add (i->audio->gain ());
+                       digester.add (i->audio->gain());
+
+                       /* Likewise we only care about position if we're looking at a
+                        * whole-project view.
+                        */
+                       digester.add (i->position().get());
+                       digester.add (i->trim_start().get());
+                       digester.add (i->trim_end().get());
                }
        }
 
@@ -473,7 +478,6 @@ 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());
        if (_release_territory) {
                root->add_child("ReleaseTerritory")->add_child_text(_release_territory->subtag());
        }
@@ -650,10 +654,6 @@ Film::read_metadata (optional<boost::filesystem::path> path)
        if (name_language) {
                _name_language = dcp::LanguageTag (*name_language);
        }
-       auto audio_language = f.optional_string_child("AudioLanguage");
-       if (audio_language) {
-               _audio_language = dcp::LanguageTag (*audio_language);
-       }
        auto release_territory = f.optional_string_child("ReleaseTerritory");
        if (release_territory) {
                _release_territory = dcp::LanguageTag::RegionSubtag (*release_territory);
@@ -1674,7 +1674,7 @@ Film::make_kdm (
        map<shared_ptr<const dcp::ReelFileAsset>, dcp::Key> keys;
 
        for (auto i: cpl->reel_file_assets()) {
-               if (!i->key_id()) {
+               if (!i->encrypted()) {
                        continue;
                }
 
@@ -1997,14 +1997,6 @@ Film::set_name_language (dcp::LanguageTag lang)
 }
 
 
-void
-Film::set_audio_language (dcp::LanguageTag lang)
-{
-       FilmChangeSignaller ch (this, Property::AUDIO_LANGUAGE);
-       _audio_language = lang;
-}
-
-
 void
 Film::set_release_territory (optional<dcp::LanguageTag::RegionSubtag> region)
 {