From 174257e628a37f891c8fed088b8baf0103ad4f5c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 15 Aug 2016 22:06:01 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f0d70286..2ba295fd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-08-15 Carl Hetherington + + * Version 2.9.12 released. + 2016-08-15 Carl Hetherington * Version 2.9.11 released. 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 Mon, 15 Aug 2016 00:56:03 +0100 + -- Carl Hetherington Mon, 15 Aug 2016 22:06:01 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 05d4ee0b0..1ab5154a2 100644 --- a/wscript +++ b/wscript @@ -27,7 +27,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.9.11devel' +VERSION = '2.9.12' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 8482da8426e1478b30dc273288900ddf7877be31 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 15 Aug 2016 22:06:02 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 1ab5154a2..31d0888b3 100644 --- a/wscript +++ b/wscript @@ -27,7 +27,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.9.12' +VERSION = '2.9.12devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 1735af36a8fe197b1cc77b569b3933c74457d995 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 16 Aug 2016 01:04:07 +0100 Subject: Remove unused variable. --- src/lib/player.cc | 2 +- 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 > subs = overlaps (time, time + length, has_subtitle); - PlayerSubtitles ps (time, length); + PlayerSubtitles ps (time); for (list >::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 > fonts_); DCPTime from; - DCPTime to; std::list > fonts; /** ImageSubtitles, with their rectangles transformed as specified by their content */ -- cgit v1.2.3