X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=8a28762d3faf10078f893a02e6a942e9d41774a6;hp=552017c64179920d4ad5240a486da088167e5988;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=673ba43fb66eb0dee43807501753749f144254a7 diff --git a/src/lib/content.h b/src/lib/content.h index 552017c64..8a28762d3 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -34,7 +34,7 @@ #include #include #include -#include + namespace xmlpp { class Node; @@ -46,6 +46,7 @@ namespace cxml { class Job; class Film; +class AtmosContent; class ContentProperty { @@ -61,23 +62,23 @@ public: /** @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 boost::noncopyable { public: explicit Content (); - Content (DCPTime); + Content (dcpomatic::DCPTime); Content (boost::filesystem::path); Content (cxml::ConstNodePtr); - Content (std::vector >); + Content (std::vector >); virtual ~Content () {} /** 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 film, 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. @@ -90,15 +91,15 @@ public: virtual std::string technical_summary () const; virtual void as_xml (xmlpp::Node *, bool with_paths) const; - virtual DCPTime full_length (boost::shared_ptr) const = 0; - virtual DCPTime approximate_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_paths (std::vector paths); @@ -135,36 +136,36 @@ public: return _digest; } - void set_position (boost::shared_ptr film, 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 (boost::shared_ptr film) const { + dcpomatic::DCPTime end (std::shared_ptr film) const { return position() + length_after_trim(film); } - DCPTime length_after_trim (boost::shared_ptr film) const; + dcpomatic::DCPTime length_after_trim (std::shared_ptr film) const; boost::optional video_frame_rate () const { boost::mutex::scoped_lock lm (_mutex); @@ -174,29 +175,30 @@ public: void set_video_frame_rate (double r); void unset_video_frame_rate (); - double active_video_frame_rate (boost::shared_ptr film) const; + double active_video_frame_rate (std::shared_ptr film) const; void set_change_signals_frequent (bool f) { _change_signals_frequent = f; } - std::list user_properties () const; + std::list user_properties (std::shared_ptr film) const; std::string calculate_digest () const; - /* CHANGE_PENDING and CHANGE_CANCELLED may be emitted from any thread; CHANGE_DONE always from GUI thread */ - boost::signals2::signal, int, bool)> Change; + /* CHANGE_TYPE_PENDING and CHANGE_TYPE_CANCELLED may be emitted from any thread; CHANGE_TYPE_DONE always from GUI thread */ + boost::signals2::signal, int, bool)> Change; - boost::shared_ptr video; - boost::shared_ptr audio; - std::list > text; + std::shared_ptr video; + std::shared_ptr audio; + std::list > text; + std::shared_ptr atmos; - boost::shared_ptr only_text () const; - boost::shared_ptr text_of_original_type (TextType type) const; + std::shared_ptr only_text () const; + std::shared_ptr text_of_original_type (TextType type) const; protected: - virtual void add_properties (std::list &) const; + 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. @@ -219,9 +221,9 @@ private: 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).