Keep active subtitles around until the video they are on has been emitted.

1 files changed, 18 insertions, 3 deletions

diff --git a/src/lib/player.h b/src/lib/player.h
index 719e42895..18b47043a 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -152,7 +152,8 @@ private:
 
 	AudioMerger _audio_merger;
 
-	class StreamState {
+	class StreamState
+	{
 	public:
 		StreamState () {}
 
@@ -169,8 +170,22 @@ private:
 	std::list<DCPTimePeriod> _no_video;
 	std::list<DCPTimePeriod> _no_audio;
 
-	typedef std::map<boost::weak_ptr<Piece>, std::pair<PlayerSubtitles, DCPTime> > ActiveSubtitles;
-	ActiveSubtitles _active_subtitles;
+	class ActiveSubtitles
+	{
+	public:
+		ActiveSubtitles () {}
+
+		ActiveSubtitles (PlayerSubtitles s, DCPTime f)
+			: subs (s)
+			, from (f)
+		{}
+
+		PlayerSubtitles subs;
+		DCPTime from;
+		boost::optional<DCPTime> to;
+	};
+	typedef std::map<boost::weak_ptr<Piece>, ActiveSubtitles> ActiveSubtitlesMap;
+	ActiveSubtitlesMap _active_subtitles;
 
 	boost::shared_ptr<AudioProcessor> _audio_processor;
 	typedef std::map<std::pair<boost::shared_ptr<const AudioContent>, AudioStreamPtr>, boost::shared_ptr<Resampler> > ResamplerMap;