From aeb7d4f12386dcf93f458b1b641bddcf0facf2fb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 15 Jun 2014 23:53:46 +0100 Subject: Bump version --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 41713f4d2..e6bc2126c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-15 Carl Hetherington + + * Version 1.69.28 released. + 2014-06-12 Carl Hetherington * Version 1.69.27 released. -- cgit v1.2.3 From c33fc4d10ee3a3b62ccc1b8122c791d4dfd61a60 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Jun 2014 13:29:43 +0100 Subject: Fix awful thinko causing Playlist::active_frame_rate_change to return the wrong thing sometimes. --- ChangeLog | 4 ++++ src/lib/playlist.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index e6bc2126c..d0f8d7b3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-18 Carl Hetherington + + * Fix thinko causing incorrect audio sample rates in some cases. + 2014-06-15 Carl Hetherington * Version 1.69.28 released. diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 247c4837b..dc87fbfab 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -404,7 +404,7 @@ Playlist::active_frame_rate_change (Time t, int dcp_video_frame_rate) const for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { shared_ptr vc = dynamic_pointer_cast (*i); if (!vc) { - break; + continue; } if (vc->position() >= t && t < vc->end()) { -- cgit v1.2.3 From 720cb01758fadd957c37667556a9ef62b0fc80ae Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Jun 2014 13:31:03 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index d0f8d7b3d..22e314e46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-18 Carl Hetherington + + * Version 1.69.29 released. + 2014-06-18 Carl Hetherington * Fix thinko causing incorrect audio sample rates in some cases. diff --git a/debian/changelog b/debian/changelog index 2a482b81d..fdd0cc20d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.28-1) UNRELEASED; urgency=low +dcpomatic (1.69.29-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -152,8 +152,9 @@ dcpomatic (1.69.28-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sun, 15 Jun 2014 23:53:46 +0100 + -- Carl Hetherington Wed, 18 Jun 2014 13:31:03 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 8956d06c0..297bf8479 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.28devel' +VERSION = '1.69.29' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3