No-op: remove all trailing whitespace.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 0f5e83b10298ff93c85f0b1dee3ee5dc388d282e..276c9794834db2aeaa6a08668b8fe8530d58dbe2 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
@@ -17,18 +17,19 @@
 
 */
 
-#include <boost/shared_ptr.hpp>
 #include "types.h"
 #include "position.h"
 #include "colour_conversion.h"
 #include "position_image.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
+#include <boost/shared_ptr.hpp>
 
 class Image;
 class ImageProxy;
-class Scaler;
 class Socket;
-class Log;
-class EncodedData;
+class Data;
 
 /** Everything needed to describe a video frame coming out of the player, but with the
  *  bits still their raw form.  We may want to combine the bits on a remote machine,
@@ -44,23 +45,22 @@ public:
                boost::optional<float>,
                dcp::Size,
                dcp::Size,
-               Scaler const *,
                Eyes,
                Part,
-               ColourConversion
+               boost::optional<ColourConversion>
                );
-       
-       PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>, boost::shared_ptr<Log>);
+
+       PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
 
        void set_subtitle (PositionImage);
-       
-       boost::shared_ptr<Image> image (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;
 
        bool has_j2k () const;
-       boost::shared_ptr<EncodedData> j2k () const;
+       Data j2k () const;
 
        DCPTime time () const {
                return _time;
@@ -70,7 +70,7 @@ public:
                return _eyes;
        }
 
-       ColourConversion colour_conversion () const {
+       boost::optional<ColourConversion> colour_conversion () const {
                return _colour_conversion;
        }
 
@@ -91,9 +91,8 @@ private:
        boost::optional<float> _fade;
        dcp::Size _inter_size;
        dcp::Size _out_size;
-       Scaler const * _scaler;
        Eyes _eyes;
        Part _part;
-       ColourConversion _colour_conversion;
+       boost::optional<ColourConversion> _colour_conversion;
        PositionImage _subtitle;
 };