Add a log message and actually use device_for_write().

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 0c195905613371eea6a119420c00f78478f528b1..6cce07c17f3fa23bcb047f660582e02b553e7efa 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -89,8 +89,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 +106,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);
@@ -239,7 +240,8 @@ public:
                UPLOAD_AFTER_MAKE_DCP,
                REENCODE_J2K,
                MARKERS,
-               RATINGS
+               RATINGS,
+               CONTENT_VERSION
        };
 
 
@@ -344,6 +346,10 @@ public:
                return _ratings;
        }
 
+       std::string content_version () const {
+               return _content_version;
+       }
+
        /* SET */
 
        void set_directory (boost::filesystem::path);
@@ -376,7 +382,9 @@ 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);
 
        /** Emitted when some property has of the Film is about to change or has changed */
        mutable boost::signals2::signal<void (ChangeType, Property)> Change;
@@ -384,6 +392,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;
 
@@ -403,8 +416,10 @@ 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 ();
 
        static std::string const metadata_file;
 
@@ -460,6 +475,7 @@ private:
        bool _user_explicit_video_frame_rate;
        std::map<dcp::Marker, dcpomatic::DCPTime> _markers;
        std::vector<dcp::Rating> _ratings;
+       std::string _content_version;
 
        int _state_version;
 
@@ -478,6 +494,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;