Port filter graphs to new FFmpeg API.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 53d91a3788b04131477e4d1f697f7d5a4b614806..0b717738d09bfacd7198b870003869123dd7edb7 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -65,7 +65,6 @@
 #include <dcp/decrypted_kdm.h>
 #include <dcp/raw_convert.h>
 #include <dcp/reel_file_asset.h>
-#include <dcp/reel_encryptable_asset.h>
 #include <dcp/reel_asset.h>
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
@@ -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,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());
                }
        }
 
@@ -1665,10 +1671,10 @@ Film::make_kdm (
                }
        }
 
-       map<shared_ptr<const dcp::ReelEncryptableAsset>, dcp::Key> keys;
+       map<shared_ptr<const dcp::ReelFileAsset>, dcp::Key> keys;
 
-       for (auto i: cpl->reel_encryptable_assets()) {
-               if (!i->key_id()) {
+       for (auto i: cpl->reel_file_assets()) {
+               if (!i->encrypted()) {
                        continue;
                }