X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=774210c13ff191eb37521b6be328a110d79035d1;hb=c6871fe8617b3de03662b7630355059393bf8043;hp=19ea113f76fed45232cf3e8e06ffc2a66beb8d2c;hpb=2517ec798da291dedc02dd7a7a432f7aa63133e4;p=dcpomatic.git diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 19ea113f7..774210c13 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -51,13 +51,13 @@ public: class VideoContent : public ContentPart, public boost::enable_shared_from_this { public: - VideoContent (Content* parent); + explicit VideoContent (Content* parent); VideoContent (Content* parent, std::vector >); void as_xml (xmlpp::Node *) const; std::string technical_summary () const; std::string identifier () const; - void use_template (boost::shared_ptr c); + void take_settings_from (boost::shared_ptr c); Frame length () const { boost::mutex::scoped_lock lm (_mutex); @@ -169,6 +169,7 @@ public: void add_properties (std::list &) const; void modify_position (DCPTime& pos) const; + void modify_trim_start (ContentTime& pos) const; static boost::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr, int);