Basic return of subtitles.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/lib/player.h b/src/lib/player.h
index 15fa4dbd6..f96d5ac69 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -35,6 +35,7 @@ class AudioContent;
 class Piece;
 class Image;
 class Resampler;
+class TimedSubtitle;
 
 /** @class Player
  *  @brief A class which can `play' a Playlist; emitting its audio and video.
@@ -77,6 +78,7 @@ private:
 
 	void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, bool, VideoContent::Frame);
 	void process_audio (boost::weak_ptr<Piece>, boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+	void process_subtitle (boost::weak_ptr<Piece>, boost::shared_ptr<TimedSubtitle>);
 	void setup_pieces ();
 	void playlist_changed ();
 	void content_changed (boost::weak_ptr<Content>, int);
@@ -107,6 +109,9 @@ private:
 	libdcp::Size _video_container_size;
 	boost::shared_ptr<Image> _black_frame;
 	std::map<boost::shared_ptr<AudioContent>, boost::shared_ptr<Resampler> > _resamplers;
+
+	boost::shared_ptr<TimedSubtitle> _subtitle;
+	Time _subtitle_offset;
 };
 
 #endif