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 | |
| parent | f8a0bc6135a933dcf660bbc46b4b3d29d503690e (diff) | |
| parent | 1735af36a8fe197b1cc77b569b3933c74457d995 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | src/lib/player.cc | 2 | ||||
| -rw-r--r-- | src/lib/player_subtitles.h | 4 | ||||
| -rw-r--r-- | wscript | 2 |
5 files changed, 10 insertions, 7 deletions
@@ -4,6 +4,10 @@ 2016-08-15 Carl Hetherington <cth@carlh.net> + * Version 2.9.12 released. + +2016-08-15 Carl Hetherington <cth@carlh.net> + * Version 2.9.11 released. 2016-08-14 Carl Hetherington <cth@carlh.net> diff --git a/debian/changelog b/debian/changelog index 042cbfe02..e191c403e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (2.9.11-1) UNRELEASED; urgency=low +dcpomatic (2.9.12-1) UNRELEASED; urgency=low [ Carl Hetherington ] * New upstream release. @@ -449,8 +449,9 @@ dcpomatic (2.9.11-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington <carl@d1stkfactory> Mon, 15 Aug 2016 00:56:03 +0100 + -- Carl Hetherington <carl@d1stkfactory> Mon, 15 Aug 2016 22:06:01 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low 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 */ @@ -27,7 +27,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.9.11devel' +VERSION = '2.9.12devel' def options(opt): opt.load('compiler_cxx') |