boost::shared_ptr<PlayerVideo> shallow_copy () const;
- void set_subtitle (PositionImage);
+ void set_text (PositionImage);
void prepare ();
boost::shared_ptr<Image> image (dcp::NoteHandler note, boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
void add_metadata (xmlpp::Node* node) const;
void send_binary (boost::shared_ptr<Socket> socket) const;
- void reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size);
+ bool reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size);
bool has_j2k () const;
dcp::Data j2k () const;
size_t memory_used () const;
+ boost::weak_ptr<Content> content () const {
+ return _content;
+ }
+
private:
boost::shared_ptr<const ImageProxy> _in;
Crop _crop;
Eyes _eyes;
Part _part;
boost::optional<ColourConversion> _colour_conversion;
- boost::optional<PositionImage> _subtitle;
- /** Content that we came from. This is so that reset_metadata() can work */
+ boost::optional<PositionImage> _text;
+ /** Content that we came from. This is so that reset_metadata() can work, and also
+ * for variant:swaroop's non-skippable ads.
+ */
boost::weak_ptr<Content> _content;
/** Video frame that we came from. Again, this is for reset_metadata() */
boost::optional<Frame> _video_frame;