Partial conversion of PlayerSubtitles -> PlayerText and SubtitleString -> PlainText.

[dcpomatic.git] / src / lib / video_content.h

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 623a1858bc48c6031b602c05bdb27f5814de8eb0..774210c13ff191eb37521b6be328a110d79035d1 100644 (file)
--- 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<VideoContent>
 {
 public:
-       VideoContent (Content* parent);
+       explicit VideoContent (Content* parent);
        VideoContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
 
        void as_xml (xmlpp::Node *) const;
        std::string technical_summary () const;
        std::string identifier () const;
-       void use_template (boost::shared_ptr<const VideoContent> c);
+       void take_settings_from (boost::shared_ptr<const VideoContent> c);
 
        Frame length () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -168,6 +168,9 @@ public:
        void take_from_examiner (boost::shared_ptr<VideoExaminer>);
        void add_properties (std::list<UserProperty> &) const;
 
+       void modify_position (DCPTime& pos) const;
+       void modify_trim_start (ContentTime& pos) const;
+
        static boost::shared_ptr<VideoContent> from_xml (Content* parent, cxml::ConstNodePtr, int);
 
 private: