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 5eb4e500dacd1a7bca230d5bd41b249d110bef63..854647d181dfc065f11ed191b051d5c939965683 100644 (file)
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -34,29 +34,32 @@ 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;
 
-       void set_subtitle_offset (int);
-       void set_subtitle_scale (float);
+       void set_subtitle_offset (double);
+       void set_subtitle_scale (double);
 
-       int subtitle_offset () const {
+       double subtitle_offset () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _subtitle_offset;
        }
 
-       float subtitle_scale () const {
+       double subtitle_scale () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _subtitle_scale;
        }
        
-private:       
-       /** y offset for placing subtitles, in source pixels; +ve is further down
-           the frame, -ve is further up.
+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.
        */
-       int _subtitle_offset;
+       double _subtitle_offset;
        /** scale factor to apply to subtitles */
-       float _subtitle_scale;
+       double _subtitle_scale;
 };
 
 #endif