C++11 tidying.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 4e1e6c524a5dc76d0184636be77d1d0bd12fb02d..7f6f8e498eb181d02760131d25e77d25fd80721e 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -170,7 +170,6 @@ Film::Film (optional<boost::filesystem::path> dir)
        , _name_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)
@@ -285,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
@@ -299,7 +298,7 @@ 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());
                }
        }
 
@@ -1668,7 +1667,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;
                }