Remove some now-pointless passing of name_values.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 68f8b5334a4f1ec9c6eaff5288d56aecae415d54..40d366f8f68c8a331ee7840c9bf37ee944515f89 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -60,7 +60,6 @@ class AudioProcessor;
 class AudioMapping;
 class Ratio;
 class Job;
-class ScreenKDM;
 class Film;
 struct isdcf_name_test;
 
@@ -89,8 +88,8 @@ private:
 
 /** @class Film
  *
- *  @brief A representation of some audio and video content, and details of
- *  how they should be presented in a DCP.
+ *  @brief A representation of some audio, video, subtitle and closed-caption content,
+ *  and details of how they should be presented in a DCP.
  *
  *  The content of a Film is held in a Playlist (created and managed by the Film).
  */
@@ -106,6 +105,7 @@ public:
        boost::filesystem::path internal_video_asset_filename (dcpomatic::DCPTimePeriod p) const;
 
        boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
+       boost::filesystem::path subtitle_analysis_path (boost::shared_ptr<const Content>) const;
 
        void send_dcp_to_tms ();
        void make_dcp (bool gui = false, bool check = true);
@@ -168,16 +168,6 @@ public:
                boost::optional<int> disable_forensic_marking_audio
                ) const;
 
-       std::list<boost::shared_ptr<ScreenKDM> > make_kdms (
-               std::list<boost::shared_ptr<dcpomatic::Screen> > screens,
-               boost::filesystem::path cpl_file,
-               boost::posix_time::ptime from,
-               boost::posix_time::ptime until,
-               dcp::Formulation formulation,
-               bool disable_forensic_marking_picture,
-               boost::optional<int> disable_forensic_marking_audio
-               ) const;
-
        int state_version () const {
                return _state_version;
        }
@@ -381,6 +371,7 @@ public:
        void set_reencode_j2k (bool);
        void set_marker (dcp::Marker type, dcpomatic::DCPTime time);
        void unset_marker (dcp::Marker type);
+       void clear_markers ();
        void set_ratings (std::vector<dcp::Rating> r);
        void set_content_version (std::string v);
 
@@ -390,6 +381,11 @@ public:
        /** Emitted when some property of our content has changed */
        mutable boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> ContentChange;
 
+       /** Emitted when the film's length might have changed; this is not like a normal
+           property as its value is derived from the playlist, so it has its own signal.
+       */
+       mutable boost::signals2::signal<void ()> LengthChange;
+
        /** Emitted when we have something important to tell the user */
        boost::signals2::signal<void (std::string)> Message;
 
@@ -409,6 +405,7 @@ private:
        void playlist_change (ChangeType);
        void playlist_order_changed ();
        void playlist_content_change (ChangeType type, boost::weak_ptr<Content>, int, bool frequent);
+       void playlist_length_change ();
        void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>, bool disable_audio_analysis);
        void audio_analysis_finished ();
        void check_settings_consistency ();
@@ -486,6 +483,7 @@ private:
        boost::signals2::scoped_connection _playlist_change_connection;
        boost::signals2::scoped_connection _playlist_order_changed_connection;
        boost::signals2::scoped_connection _playlist_content_change_connection;
+       boost::signals2::scoped_connection _playlist_length_change_connection;
        std::list<boost::signals2::connection> _job_connections;
        std::list<boost::signals2::connection> _audio_analysis_connections;