X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=f2fecddf063df96a2546fffb66cd82722922aa13;hb=0f11f0c25465464b28db713cccd37d7d8de483e1;hp=5f8e9f53d3a8a0a25c79315635f4bd7653a01f0f;hpb=ca981c8cfa23111e92be329f1c2dfbe3a07b4247;p=dcpomatic.git diff --git a/src/lib/content.h b/src/lib/content.h index 5f8e9f53d..f2fecddf0 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,23 +18,26 @@ */ + /** @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 "dcpomatic_time.h" +#include "signaller.h" #include "user_property.h" +#include "text_type.h" #include #include #include #include -#include + namespace xmlpp { class Node; @@ -47,6 +50,9 @@ namespace cxml { class Job; class Film; class AtmosContent; +class AudioContent; +class TextContent; +class VideoContent; class ContentProperty { @@ -59,26 +65,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 (); Content (dcpomatic::DCPTime); Content (boost::filesystem::path); Content (cxml::ConstNodePtr); - Content (std::vector >); + 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 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. @@ -91,15 +101,15 @@ public: virtual std::string technical_summary () const; virtual void as_xml (xmlpp::Node *, bool with_paths) const; - virtual dcpomatic::DCPTime full_length (boost::shared_ptr) 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 (boost::shared_ptr) 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); @@ -136,7 +146,7 @@ public: return _digest; } - void set_position (boost::shared_ptr film, dcpomatic::DCPTime, bool force_emit = false); + void set_position (std::shared_ptr film, dcpomatic::DCPTime, bool force_emit = false); /** dcpomatic::DCPTime that this content starts; i.e. the time that the first * bit of the content (trimmed or not) will happen. @@ -146,7 +156,7 @@ public: return _position; } - void set_trim_start (dcpomatic::ContentTime); + void set_trim_start(std::shared_ptr film, dcpomatic::ContentTime); dcpomatic::ContentTime trim_start () const { boost::mutex::scoped_lock lm (_mutex); @@ -161,44 +171,55 @@ public: } /** @return Time immediately after the last thing in this content */ - dcpomatic::DCPTime end (boost::shared_ptr film) const { + dcpomatic::DCPTime end (std::shared_ptr film) const { return position() + length_after_trim(film); } - dcpomatic::DCPTime length_after_trim (boost::shared_ptr film) const; + dcpomatic::DCPTimePeriod period(std::shared_ptr film) const { + return { position(), end(film) }; + } + + dcpomatic::DCPTime length_after_trim (std::shared_ptr film) const; boost::optional video_frame_rate () const { boost::mutex::scoped_lock lm (_mutex); return _video_frame_rate; } - void set_video_frame_rate (double r); + void set_video_frame_rate(std::shared_ptr film, 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 (boost::shared_ptr film) const; + std::list user_properties (std::shared_ptr film) const; std::string calculate_digest () const; - /* 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; + virtual bool can_be_played () const { + return true; + } + + /* 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; - std::list > text; - boost::shared_ptr atmos; + std::shared_ptr video; + std::shared_ptr audio; + std::vector> 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; + + /** @return true if this content has changed since it was last examined */ + bool changed () const; protected: - virtual void add_properties (boost::shared_ptr film, 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. @@ -212,7 +233,8 @@ private: 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; + friend struct subtitle_font_id_change_test2; + template friend class ChangeSignalDespatcher; void signal_change (ChangeType, int); @@ -229,7 +251,12 @@ private: * else (either some video happening at the same time, or the rate of the DCP). */ boost::optional _video_frame_rate; - bool _change_signals_frequent; + bool _change_signals_frequent = false; }; + +typedef ChangeSignaller ContentChangeSignaller; +typedef ChangeSignalDespatcher ContentChangeSignalDespatcher; + + #endif