X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.h;h=b7f7987ef4fa0d79783df8a56d869f52fedfabf8;hb=23b69b228ed5b34b59e1789de4bff052bc905ae4;hp=f7e97feac9a3489d1083f96278a4eea3e491d367;hpb=9e4c091e6ef0f79fab10664e95240de2f14e5702;p=dcpomatic.git diff --git a/src/lib/content.h b/src/lib/content.h index f7e97feac..b7f7987ef 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,15 +24,15 @@ #ifndef DCPOMATIC_CONTENT_H #define DCPOMATIC_CONTENT_H -#include +#include "types.h" +#include "signaller.h" +#include "dcpomatic_time.h" +#include +#include #include #include #include #include -#include -#include -#include "types.h" -#include "dcpomatic_time.h" namespace cxml { class Node; @@ -54,7 +54,7 @@ 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 boost::noncopyable +class Content : public boost::enable_shared_from_this, public Signaller, public boost::noncopyable { public: Content (boost::shared_ptr); @@ -69,22 +69,23 @@ public: * @param job Job to use to report progress, or 0. */ virtual void examine (boost::shared_ptr job); - + /** @return Quick one-line summary of the content, as will be presented in the * film editor. */ virtual std::string summary () const = 0; - + /** @return Technical details of this content; these are written to logs to * help with debugging. */ virtual std::string technical_summary () const; - - virtual std::string information () const = 0; + virtual void as_xml (xmlpp::Node *) const; virtual DCPTime full_length () const = 0; virtual std::string identifier () const; + std::list > properties () const; + boost::shared_ptr clone () const; void set_path (boost::filesystem::path); @@ -105,10 +106,13 @@ public: boost::mutex::scoped_lock lm (_mutex); return _paths[i]; } - + bool paths_valid () const; - /** @return MD5 digest of the content's file(s) */ + /** @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). + */ std::string digest () const { boost::mutex::scoped_lock lm (_mutex); return _digest; @@ -124,26 +128,27 @@ public: return _position; } - void set_trim_start (DCPTime); + void set_trim_start (ContentTime); - DCPTime trim_start () const { + ContentTime trim_start () const { boost::mutex::scoped_lock lm (_mutex); return _trim_start; } - void set_trim_end (DCPTime); - - DCPTime trim_end () const { + void set_trim_end (ContentTime); + + 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(); } DCPTime length_after_trim () const; - + void set_change_signals_frequent (bool f) { _change_signals_frequent = f; } @@ -156,6 +161,7 @@ public: protected: void signal_changed (int); + virtual void add_properties (std::list > &) const {} boost::weak_ptr _film; @@ -166,12 +172,12 @@ protected: /** Paths of our data files */ std::vector _paths; - + private: std::string _digest; DCPTime _position; - DCPTime _trim_start; - DCPTime _trim_end; + ContentTime _trim_start; + ContentTime _trim_end; bool _change_signals_frequent; };