From 04ef57589ebb7c0de3377172a03b24698fd2364a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Mar 2014 14:24:08 +0000 Subject: Tentative support for 3D from alternate frames. Also remove references to libpostproc. Requested-by: Jean-Jacques Mantello --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 5a99d30ff..45847805a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-03-18 Carl Hetherington + + * Tentative support for 3D from alternate frames of the source. + 2014-03-17 Carl Hetherington * Improve behaviour of the position slider at the end of films. -- cgit v1.2.3 From ae27e065d49a5d2476913f677745dd7e4a31cc09 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Mar 2014 15:19:13 +0000 Subject: Fix bad rounding of timecodes for display. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported-by: Gérald Maruccia --- ChangeLog | 2 ++ src/wx/timecode.cc | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 45847805a..f4830e40d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-03-18 Carl Hetherington + * Fix bad rounding of timecodes. + * Tentative support for 3D from alternate frames of the source. 2014-03-17 Carl Hetherington diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc index ac4fd46c4..a8c90b488 100644 --- a/src/wx/timecode.cc +++ b/src/wx/timecode.cc @@ -85,20 +85,24 @@ Timecode::Timecode (wxWindow* parent) void Timecode::set (Time t, int fps) { - int const h = t / (3600 * TIME_HZ); - t -= h * 3600 * TIME_HZ; - int const m = t / (60 * TIME_HZ); - t -= m * 60 * TIME_HZ; - int const s = t / TIME_HZ; - t -= s * TIME_HZ; - int const f = divide_with_round (t * fps, TIME_HZ); + /* Do this calculation with frames so that we can round + to a frame boundary at the start rather than the end. + */ + int64_t f = divide_with_round (t * fps, TIME_HZ); + + int const h = f / (3600 * fps); + f -= h * 3600 * fps; + int const m = f / (60 * fps); + f -= m * 60 * fps; + int const s = f / fps; + f -= s * fps; checked_set (_hours, lexical_cast (h)); checked_set (_minutes, lexical_cast (m)); checked_set (_seconds, lexical_cast (s)); checked_set (_frames, lexical_cast (f)); - _fixed->SetLabel (wxString::Format ("%02d:%02d:%02d.%02d", h, m, s, f)); + _fixed->SetLabel (wxString::Format ("%02d:%02d:%02d.%02ld", h, m, s, f)); } Time -- cgit v1.2.3 From 1d69f61742e08f93e59e9edc9982a9eb5dea391b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 18 Mar 2014 16:20:29 +0000 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 f4830e40d..418149a18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-03-18 Carl Hetherington + + * Version 1.66.3 released. + 2014-03-18 Carl Hetherington * Fix bad rounding of timecodes. diff --git a/debian/changelog b/debian/changelog index c7b6fbebc..48e48f1d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.66.2-1) UNRELEASED; urgency=low +dcpomatic (1.66.3-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -106,8 +106,9 @@ dcpomatic (1.66.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Mon, 17 Mar 2014 09:20:12 +0000 + -- Carl Hetherington Tue, 18 Mar 2014 16:20:29 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 682ceb9cd..7d3aa3f86 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.66.2devel' +VERSION = '1.66.3' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3