Basics of joining.

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

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index 1092b7b1cc7e32440515d653bc817f9005ecb680..854647d181dfc065f11ed191b051d5c939965683 100644 (file)
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -34,6 +34,7 @@ class SubtitleContent : public virtual Content
 public:
        SubtitleContent (boost::shared_ptr<const Film>, boost::filesystem::path);
        SubtitleContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+       SubtitleContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
        
        void as_xml (xmlpp::Node *) const;
 
@@ -50,7 +51,9 @@ public:
                return _subtitle_scale;
        }
        
-private:       
+private:
+       friend class ffmpeg_pts_offset_test;
+       
        /** y offset for placing subtitles, as a proportion of the container height;
            +ve is further down the frame, -ve is further up.
        */