X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=a2d78aa68539423cca457abb2005f558e6ca68fa;hp=f488962b349272d08d428e6a3848c3cc2c4dec2c;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=334b94526f2c1271718a94fe97cfa843cf6ef7a1 diff --git a/src/lib/content.h b/src/lib/content.h index f488962b3..a2d78aa68 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -27,7 +28,7 @@ #include "types.h" #include "signaller.h" #include "dcpomatic_time.h" -#include "raw_convert.h" +#include "change_signaller.h" #include "user_property.h" #include #include @@ -54,6 +55,7 @@ public: static int const LENGTH; static int const TRIM_START; static int const TRIM_END; + static int const VIDEO_FRAME_RATE; }; /** @class Content @@ -62,18 +64,20 @@ public: class Content : public boost::enable_shared_from_this, public Signaller, public boost::noncopyable { public: - 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 () {} /** 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 (boost::shared_ptr film, boost::shared_ptr job); + + virtual void take_settings_from (boost::shared_ptr c); /** @return Quick one-line summary of the content, as will be presented in the * film editor. @@ -85,17 +89,18 @@ public: */ virtual std::string technical_summary () const; - virtual void as_xml (xmlpp::Node *) const; - virtual DCPTime full_length () const = 0; + virtual void as_xml (xmlpp::Node *, bool with_paths) const; + virtual dcpomatic::DCPTime full_length (boost::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 (boost::shared_ptr) const; boost::shared_ptr clone () const; - void set_path (boost::filesystem::path); + void set_paths (std::vector paths); std::string path_summary () const; @@ -114,82 +119,114 @@ 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 * not a complete MD5-or-whatever hash, but a sort of poor - * man's version (see comments in ::examine). + * man's version (see comments in examine()). */ std::string digest () const { boost::mutex::scoped_lock lm (_mutex); return _digest; } - void set_position (DCPTime); + void set_position (boost::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 (boost::shared_ptr film) const { + return position() + length_after_trim(film); + } + + dcpomatic::DCPTime length_after_trim (boost::shared_ptr film) const; + + boost::optional video_frame_rate () const { + boost::mutex::scoped_lock lm (_mutex); + return _video_frame_rate; } - DCPTime length_after_trim () const; + void set_video_frame_rate (double r); + void unset_video_frame_rate (); + + double active_video_frame_rate (boost::shared_ptr film) const; void set_change_signals_frequent (bool f) { _change_signals_frequent = f; } - boost::shared_ptr film () const; + std::list user_properties (boost::shared_ptr film) const; - std::list user_properties () const; + std::string calculate_digest () const; - boost::signals2::signal, int, bool)> Changed; + /* 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 subtitle; + boost::shared_ptr audio; + std::list > text; - void signal_changed (int); + boost::shared_ptr only_text () const; + boost::shared_ptr text_of_original_type (TextType type) const; protected: - virtual void add_properties (std::list &) const {} - - boost::weak_ptr _film; + virtual void add_properties (boost::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; + 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; -private: 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). + */ + boost::optional _video_frame_rate; bool _change_signals_frequent; };