diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-16 14:10:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-16 14:10:54 +0100 |
| commit | 4aa2c70aa6b240d426f782b215749bee7399d6c4 (patch) | |
| tree | 27e8c7759a0dff7f0370cead7b7b23265f3a2946 /src | |
| parent | f8a0bc6135a933dcf660bbc46b4b3d29d503690e (diff) | |
| parent | 1735af36a8fe197b1cc77b569b3933c74457d995 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/player.cc | 2 | ||||
| -rw-r--r-- | src/lib/player_subtitles.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index db62cbcc8..7dcaf68b7 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -590,7 +590,7 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, { list<shared_ptr<Piece> > subs = overlaps (time, time + length, has_subtitle); - PlayerSubtitles ps (time, length); + PlayerSubtitles ps (time); for (list<shared_ptr<Piece> >::const_iterator j = subs.begin(); j != subs.end(); ++j) { if (!(*j)->content->subtitle->use () || (!_always_burn_subtitles && (burnt != (*j)->content->subtitle->burn ()))) { diff --git a/src/lib/player_subtitles.h b/src/lib/player_subtitles.h index b43a1d0a9..9e50ea777 100644 --- a/src/lib/player_subtitles.h +++ b/src/lib/player_subtitles.h @@ -30,15 +30,13 @@ class Font; class PlayerSubtitles { public: - PlayerSubtitles (DCPTime f, DCPTime t) + PlayerSubtitles (DCPTime f) : from (f) - , to (t) {} void add_fonts (std::list<boost::shared_ptr<Font> > fonts_); DCPTime from; - DCPTime to; std::list<boost::shared_ptr<Font> > fonts; /** ImageSubtitles, with their rectangles transformed as specified by their content */ |