From: Carl Hetherington Date: Tue, 16 Sep 2014 22:26:55 +0000 (+0100) Subject: Merge master. X-Git-Tag: v2.0.48~590 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=1c13441a19aa387ddd8ac0c972207ccbbe3114d8 Merge master. --- 1c13441a19aa387ddd8ac0c972207ccbbe3114d8 diff --cc ChangeLog index 222a0eea1,f028d76f3..65518b42b --- a/ChangeLog +++ b/ChangeLog @@@ -1,18 -1,25 +1,38 @@@ + 2014-09-16 Carl Hetherington + + * Version 1.73.7 released. + + 2014-09-16 Carl Hetherington + + * Fix non-update of audio gain when changing selected content. + + 2014-09-14 Carl Hetherington + + * Version 1.73.6 released. + + 2014-09-14 Carl Hetherington + + * Version 1.73.5 released. + + 2014-09-14 Carl Hetherington + + * Update to nl_NL translation from Cherif Ben Brahim. + 2014-09-12 Carl Hetherington + * Version 2.0.9 released. + +2014-09-12 Carl Hetherington + + * Add "re-examine" option to content context menu (#339). + +2014-09-11 Carl Hetherington + + * Restore encoding optimisations for still-image sources. + + * Add option to re-make signing chain with specified organisation, + common names etc. (#354) + * Allow separate X and Y scale for subtitles (#337). 2014-09-10 Carl Hetherington diff --cc debian/changelog index 8dc45469b,16e2e433a..c71a60422 --- a/debian/changelog +++ b/debian/changelog @@@ -1,186 -1,190 +1,8 @@@ -dcpomatic (1.73.7-1) UNRELEASED; urgency=low +dcpomatic (2.0.9-1) UNRELEASED; urgency=low * New upstream release. - * New upstream release. - * New upstream release. - * New upstream release. - * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. -- * New upstream release. - -- Carl Hetherington Tue, 16 Sep 2014 21:19:53 +0100 + -- Carl Hetherington Fri, 12 Sep 2014 00:17:46 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --cc src/lib/audio_decoder.cc index 756192286,30bd2540a..f3251f306 --- a/src/lib/audio_decoder.cc +++ b/src/lib/audio_decoder.cc @@@ -17,11 -17,12 +17,12 @@@ */ + #include #include "audio_decoder.h" #include "audio_buffers.h" -#include "exceptions.h" -#include "log.h" +#include "audio_processor.h" #include "resampler.h" +#include "util.h" #include "i18n.h"