Clear _video/_audio when the seek is request, not when it's performed.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index ad94852a2486e9757a888d205a70a33ee7e9f735..fdd4674d5f40c507414a6fd41d6ecca456c5d48f 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -47,7 +47,6 @@ namespace xmlpp {
 class DCPContentType;
 class Log;
 class Content;
-class Player;
 class Playlist;
 class AudioContent;
 class Screen;
@@ -89,7 +88,7 @@ public:
        }
 
        boost::filesystem::path file (boost::filesystem::path f) const;
-       boost::filesystem::path dir (boost::filesystem::path d) const;
+       boost::filesystem::path dir (boost::filesystem::path d, bool create = true) const;
 
        void use_template (std::string name);
        std::list<std::string> read_metadata (boost::optional<boost::filesystem::path> path = boost::optional<boost::filesystem::path> ());
@@ -121,6 +120,7 @@ public:
        DCPTime length () const;
        int best_video_frame_rate () const;
        FrameRateChange active_frame_rate_change (DCPTime) const;
+       std::pair<double, double> speed_up_range (int dcp_frame_rate) const;
 
        dcp::EncryptedKDM make_kdm (
                dcp::Certificate recipient,
@@ -132,7 +132,7 @@ public:
                ) const;
 
        std::list<ScreenKDM> make_kdms (
-               std::list<boost::shared_ptr<Screen> >,
+               std::list<boost::shared_ptr<Screen> > screens,
                boost::filesystem::path cpl_file,
                boost::posix_time::ptime from,
                boost::posix_time::ptime until,
@@ -161,9 +161,6 @@ public:
        std::list<DCPTimePeriod> reels () const;
        std::list<int> mapped_audio_channels () const;
 
-       /** @param A period within the DCP
-        *  @return Name of the content which most contributes to the given period.
-        */
        std::string content_summary (DCPTimePeriod period) const;
 
        std::list<std::string> fix_conflicting_settings ();
@@ -284,6 +281,11 @@ public:
                return _upload_after_make_dcp;
        }
 
+       std::string context_id () const {
+               return _context_id;
+       }
+
+
        /* SET */
 
        void set_directory (boost::filesystem::path);
@@ -357,6 +359,10 @@ private:
        bool _signed;
        bool _encrypted;
        dcp::Key _key;
+       /** context ID used when encrypting picture assets; we keep it so that we can
+        *  re-start picture MXF encodes.
+        */
+       std::string _context_id;
        /** bandwidth for J2K files in bits per second */
        int _j2k_bandwidth;
        /** ISDCF naming stuff */