#include <list>
#include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp>
+#include <libdcp/subtitle_asset.h>
#include "playlist.h"
#include "content.h"
#include "film.h"
void emit_black ();
void emit_silence (AudioFrame);
void film_changed (Film::Property);
- void update_subtitle ();
+ void update_subtitle_from_image ();
+ void update_subtitle_from_text ();
void emit_video (boost::weak_ptr<Piece>, boost::shared_ptr<DecodedVideo>);
void emit_audio (boost::weak_ptr<Piece>, boost::shared_ptr<DecodedAudio>);
void step_video_position (boost::shared_ptr<DecodedVideo>);
struct {
boost::weak_ptr<Piece> piece;
- boost::shared_ptr<DecodedSubtitle> subtitle;
- } _in_subtitle;
+ boost::shared_ptr<DecodedImageSubtitle> subtitle;
+ } _image_subtitle;
+ struct {
+ boost::weak_ptr<Piece> piece;
+ boost::shared_ptr<DecodedTextSubtitle> subtitle;
+ } _text_subtitle;
+
struct {
Position<int> position;
boost::shared_ptr<Image> image;