Use more local methods rather than calling out to Film in the Decoder.

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

diff --git a/src/lib/subtitle.h b/src/lib/subtitle.h
index 1cc906ce05fcc50f7987267c9572e5659b2eefa0..590e0dd31b8ac2865d680b5f3e7343bc76560e39 100644 (file)
--- a/src/lib/subtitle.h
+++ b/src/lib/subtitle.h
@@ -46,24 +46,24 @@ public:
                return _image;
        }
 
-       Rectangle area () const;
+       Rect area () const;
        
 private:
        Position _position;
        boost::shared_ptr<Image> _image;
 };
 
-Rectangle
+Rect
 subtitle_transformed_area (
        float target_x_scale, float target_y_scale,
-       Rectangle sub_area, int subtitle_offset, float subtitle_scale
+       Rect sub_area, int subtitle_offset, float subtitle_scale
        );
 
 /** A Subtitle class with details of the time over which it should be shown */
 class TimedSubtitle
 {
 public:
-       TimedSubtitle (AVSubtitle const &);
+       TimedSubtitle (AVSubtitle const &, double c);
 
        bool displayed_at (double t) const;