Merge master.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 0f5e83b10298ff93c85f0b1dee3ee5dc388d282e..610a7526cb26090d582e647fff99ca3518a9d035 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -18,6 +18,9 @@
 */
 
 #include <boost/shared_ptr.hpp>
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
 #include "types.h"
 #include "position.h"
 #include "colour_conversion.h"
@@ -47,14 +50,14 @@ public:
                Scaler const *,
                Eyes,
                Part,
-               ColourConversion
+               boost::optional<ColourConversion>
                );
        
        PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>, boost::shared_ptr<Log>);
 
        void set_subtitle (PositionImage);
        
-       boost::shared_ptr<Image> image (bool burn_subtitle) const;
+       boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, bool burn_subtitle) const;
 
        void add_metadata (xmlpp::Node* node, bool send_subtitles) const;
        void send_binary (boost::shared_ptr<Socket> socket, bool send_subtitles) const;
@@ -70,7 +73,7 @@ public:
                return _eyes;
        }
 
-       ColourConversion colour_conversion () const {
+       boost::optional<ColourConversion> colour_conversion () const {
                return _colour_conversion;
        }
 
@@ -94,6 +97,6 @@ private:
        Scaler const * _scaler;
        Eyes _eyes;
        Part _part;
-       ColourConversion _colour_conversion;
+       boost::optional<ColourConversion> _colour_conversion;
        PositionImage _subtitle;
 };