#include "types.h"
#include "position.h"
+#include "dcpomatic_time.h"
#include "colour_conversion.h"
#include "position_image.h"
+#include "data.h"
extern "C" {
#include <libavutil/pixfmt.h>
}
class Image;
class ImageProxy;
class Socket;
-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,
boost::shared_ptr<const ImageProxy>,
DCPTime,
Crop,
- boost::optional<float>,
+ boost::optional<double>,
dcp::Size,
dcp::Size,
Eyes,
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;
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;
};