Remove Scaler config and use SWS_BICUBIC everywhere.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 935690a08dea475057dd30d647743e6604e6060c..c4537f713432907376756669fff488d813152b8f 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -28,7 +28,6 @@ extern "C" {
 
 class Image;
 class ImageProxy;
-class Scaler;
 class Socket;
 class EncodedData;
 
@@ -46,7 +45,6 @@ public:
                boost::optional<float>,
                dcp::Size,
                dcp::Size,
-               Scaler const *,
                Eyes,
                Part,
                boost::optional<ColourConversion>
@@ -56,7 +54,7 @@ public:
 
        void set_subtitle (PositionImage);
        
-       boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, bool burn_subtitle) const;
+       boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, bool burn_subtitle, 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;
@@ -93,7 +91,6 @@ private:
        boost::optional<float> _fade;
        dcp::Size _inter_size;
        dcp::Size _out_size;
-       Scaler const * _scaler;
        Eyes _eyes;
        Part _part;
        boost::optional<ColourConversion> _colour_conversion;