float -> double in a few places.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 276c9794834db2aeaa6a08668b8fe8530d58dbe2..0a6cab9069e189c9ea6bdf1161a1a9912edf59a1 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -42,7 +42,7 @@ public:
                boost::shared_ptr<const ImageProxy>,
                DCPTime,
                Crop,
-               boost::optional<float>,
+               boost::optional<double>,
                dcp::Size,
                dcp::Size,
                Eyes,
@@ -54,10 +54,10 @@ public:
 
        void set_subtitle (PositionImage);
 
-       boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, bool burn_subtitle, dcp::NoteHandler note) const;
+       boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, dcp::NoteHandler note) const;
 
-       void add_metadata (xmlpp::Node* node, bool send_subtitles) const;
-       void send_binary (boost::shared_ptr<Socket> socket, bool send_subtitles) const;
+       void add_metadata (xmlpp::Node* node) const;
+       void send_binary (boost::shared_ptr<Socket> socket) const;
 
        bool has_j2k () const;
        Data j2k () const;
@@ -88,11 +88,11 @@ private:
        boost::shared_ptr<const ImageProxy> _in;
        DCPTime _time;
        Crop _crop;
-       boost::optional<float> _fade;
+       boost::optional<double> _fade;
        dcp::Size _inter_size;
        dcp::Size _out_size;
        Eyes _eyes;
        Part _part;
        boost::optional<ColourConversion> _colour_conversion;
-       PositionImage _subtitle;
+       boost::optional<PositionImage> _subtitle;
 };