diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-04-25 23:43:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-04-25 23:43:16 +0100 |
| commit | 9c1e0071803bf05f8c476d870e360c9e320ba696 (patch) | |
| tree | c94a825ad7a32495fa7e372ce79247e69c84c272 /src/lib/player.h | |
| parent | 588397fc600e888acf77375fe39c238ff2bf3649 (diff) | |
Fix subtitle display when the next subtitle is decoded before the
previous one has finished; this requires that more than one subtitle be
kept by the player.
Reported-by: Matthias Damm
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 5dad80ec7..4d911a83b 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -143,7 +143,7 @@ private: boost::shared_ptr<PlayerImage> _black_frame; std::map<boost::shared_ptr<AudioContent>, boost::shared_ptr<Resampler> > _resamplers; - boost::optional<Subtitle> _subtitle; + std::list<Subtitle> _subtitles; #ifdef DCPOMATIC_DEBUG boost::shared_ptr<Content> _last_video; |
