X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=d17b0d0e5a22f86360e8a678073add3a620f9084;hp=7ff20e96cba4a335f219d4aed2eb5748a98951ae;hb=07b21bb92a8d54c6c03de9aadc63ab93b65d9bc5;hpb=27b83475435dda4e84a90cf59a52f150905c4ab1 diff --git a/src/lib/content.h b/src/lib/content.h index 7ff20e96c..d17b0d0e5 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,22 +18,25 @@ */ + /** @file src/lib/content.h * @brief Content class. */ + #ifndef DCPOMATIC_CONTENT_H #define DCPOMATIC_CONTENT_H #include "types.h" #include "signaller.h" #include "dcpomatic_time.h" +#include "change_signaller.h" #include "user_property.h" #include #include #include #include -#include + namespace xmlpp { class Node; @@ -45,6 +48,7 @@ namespace cxml { class Job; class Film; +class AtmosContent; class ContentProperty { @@ -57,26 +61,30 @@ public: static int const VIDEO_FRAME_RATE; }; + /** @class Content * @brief A piece of content represented by one or more files on disk. */ -class Content : public boost::enable_shared_from_this, public Signaller, public boost::noncopyable +class Content : public std::enable_shared_from_this, public Signaller { public: - explicit Content (boost::shared_ptr); - Content (boost::shared_ptr, DCPTime); - Content (boost::shared_ptr, boost::filesystem::path); - Content (boost::shared_ptr, cxml::ConstNodePtr); - Content (boost::shared_ptr, std::vector >); + explicit Content (); + Content (dcpomatic::DCPTime); + Content (boost::filesystem::path); + Content (cxml::ConstNodePtr); + Content (std::vector>); virtual ~Content () {} + Content (Content const&) = delete; + Content& operator= (Content const&) = delete; + /** Examine the content to establish digest, frame rates and any other * useful metadata. * @param job Job to use to report progress, or 0. */ - virtual void examine (boost::shared_ptr job); + virtual void examine (std::shared_ptr film, std::shared_ptr job); - virtual void take_settings_from (boost::shared_ptr c); + virtual void take_settings_from (std::shared_ptr c); /** @return Quick one-line summary of the content, as will be presented in the * film editor. @@ -89,16 +97,16 @@ public: virtual std::string technical_summary () const; virtual void as_xml (xmlpp::Node *, bool with_paths) const; - virtual DCPTime full_length () const = 0; + virtual dcpomatic::DCPTime full_length (std::shared_ptr) const = 0; + virtual dcpomatic::DCPTime approximate_length () const = 0; virtual std::string identifier () const; /** @return points at which to split this content when * REELTYPE_BY_VIDEO_CONTENT is in use. */ - virtual std::list reel_split_points () const; + virtual std::list reel_split_points (std::shared_ptr) const; - boost::shared_ptr clone () const; + std::shared_ptr clone () const; - void set_path (boost::filesystem::path); void set_paths (std::vector paths); std::string path_summary () const; @@ -118,6 +126,11 @@ public: return _paths[i]; } + std::time_t last_write_time (size_t i) const { + boost::mutex::scoped_lock lm (_mutex); + return _last_write_times[i]; + } + bool paths_valid () const; /** @return Digest of the content's file(s). Note: this is @@ -129,36 +142,36 @@ public: return _digest; } - void set_position (DCPTime); + void set_position (std::shared_ptr film, dcpomatic::DCPTime, bool force_emit = false); - /** DCPTime that this content starts; i.e. the time that the first + /** dcpomatic::DCPTime that this content starts; i.e. the time that the first * bit of the content (trimmed or not) will happen. */ - DCPTime position () const { + dcpomatic::DCPTime position () const { boost::mutex::scoped_lock lm (_mutex); return _position; } - void set_trim_start (ContentTime); + void set_trim_start (dcpomatic::ContentTime); - ContentTime trim_start () const { + dcpomatic::ContentTime trim_start () const { boost::mutex::scoped_lock lm (_mutex); return _trim_start; } - void set_trim_end (ContentTime); + void set_trim_end (dcpomatic::ContentTime); - ContentTime trim_end () const { + dcpomatic::ContentTime trim_end () const { boost::mutex::scoped_lock lm (_mutex); return _trim_end; } /** @return Time immediately after the last thing in this content */ - DCPTime end () const { - return position() + length_after_trim(); + dcpomatic::DCPTime end (std::shared_ptr film) const { + return position() + length_after_trim(film); } - DCPTime length_after_trim () const; + dcpomatic::DCPTime length_after_trim (std::shared_ptr film) const; boost::optional video_frame_rate () const { boost::mutex::scoped_lock lm (_mutex); @@ -168,48 +181,58 @@ public: void set_video_frame_rate (double r); void unset_video_frame_rate (); - double active_video_frame_rate () const; + double active_video_frame_rate (std::shared_ptr film) const; void set_change_signals_frequent (bool f) { _change_signals_frequent = f; } - boost::shared_ptr film () const; + std::list user_properties (std::shared_ptr film) const; - std::list user_properties () const; + std::string calculate_digest () const; - boost::signals2::signal, int, bool)> Changed; + /* ChangeType::PENDING and ChangeType::CANCELLED may be emitted from any thread; ChangeType::DONE always from GUI thread */ + boost::signals2::signal, int, bool)> Change; - boost::shared_ptr video; - boost::shared_ptr audio; - boost::shared_ptr caption; + std::shared_ptr video; + std::shared_ptr audio; + std::list> text; + std::shared_ptr atmos; - void signal_changed (int); + std::shared_ptr only_text () const; + std::shared_ptr text_of_original_type (TextType type) const; -protected: + /** @return true if this content has changed since it was last examined */ + bool changed () const; - virtual void add_properties (std::list &) const; +protected: - boost::weak_ptr _film; + virtual void add_properties (std::shared_ptr film, std::list &) const; /** _mutex which should be used to protect accesses, as examine * jobs can update content state in threads other than the main one. */ mutable boost::mutex _mutex; - /** Paths of our data files */ - std::vector _paths; + void add_path (boost::filesystem::path p); private: friend struct ffmpeg_pts_offset_test; friend struct best_dcp_frame_rate_test_single; friend struct best_dcp_frame_rate_test_double; friend struct audio_sampling_rate_test; + template friend class ChangeSignaller; + + void signal_change (ChangeType, int); + + /** Paths of our data files */ + std::vector _paths; + std::vector _last_write_times; std::string _digest; - DCPTime _position; - ContentTime _trim_start; - ContentTime _trim_end; + dcpomatic::DCPTime _position; + dcpomatic::ContentTime _trim_start; + dcpomatic::ContentTime _trim_end; /** The video frame rate that this content is or was prepared to be used with, * or empty if the effective rate of this content should be dictated by something * else (either some video happening at the same time, or the rate of the DCP). @@ -218,4 +241,8 @@ private: bool _change_signals_frequent; }; + +typedef ChangeSignaller ContentChangeSignaller; + + #endif