*/
-#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;
/** Everything needed to describe a video frame coming out of the player, but with the
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) const;
void add_metadata (xmlpp::Node* node, bool send_subtitles) const;
void send_binary (boost::shared_ptr<Socket> socket, bool send_subtitles) const;
return _eyes;
}
- ColourConversion colour_conversion () const {
+ boost::optional<ColourConversion> colour_conversion () const {
return _colour_conversion;
}
Scaler const * _scaler;
Eyes _eyes;
Part _part;
- ColourConversion _colour_conversion;
+ boost::optional<ColourConversion> _colour_conversion;
PositionImage _subtitle;
};