dcpomatic.git
6 years agoMerge.
Carl Hetherington [Mon, 15 Jan 2018 20:30:18 +0000 (20:30 +0000)]
Merge.

6 years agoUpdated pt_BR translation from Max Fuhlendorf.
Carl Hetherington [Mon, 15 Jan 2018 20:30:04 +0000 (20:30 +0000)]
Updated pt_BR translation from Max Fuhlendorf.

6 years agoBump version
Carl Hetherington [Mon, 15 Jan 2018 01:57:18 +0000 (01:57 +0000)]
Bump version

6 years agoBump version v2.11.42
Carl Hetherington [Mon, 15 Jan 2018 01:57:18 +0000 (01:57 +0000)]
Bump version

6 years agoFix incorrect reel lengths when start-trimmed movie content follows
Carl Hetherington [Mon, 15 Jan 2018 00:42:58 +0000 (00:42 +0000)]
Fix incorrect reel lengths when start-trimmed movie content follows
image-only content (e.g. crash1.xml in dcpomatic-test).  We must consider
the _silent "source" to be like an audio stream when deciding when
to pull up to.

6 years agoTry to tidy up behaviour of seek during playback in the preview;
Carl Hetherington [Mon, 15 Jan 2018 00:14:51 +0000 (00:14 +0000)]
Try to tidy up behaviour of seek during playback in the preview;
before play would continue during the drag which made it feel nasty.
Now play stops during the drag (at least on Linux...)

6 years agoFix play button state on seeking.
Carl Hetherington [Sun, 14 Jan 2018 23:54:09 +0000 (23:54 +0000)]
Fix play button state on seeking.

6 years agoComment typo.
Carl Hetherington [Sun, 14 Jan 2018 23:51:26 +0000 (23:51 +0000)]
Comment typo.

6 years agoUpdated nl_NL translation from Rob van Nieuwkerk.
Carl Hetherington [Sun, 14 Jan 2018 19:58:17 +0000 (19:58 +0000)]
Updated nl_NL translation from Rob van Nieuwkerk.

6 years agoUpdated de_DE translation from Carsten Kurz.
Carl Hetherington [Sun, 14 Jan 2018 19:57:31 +0000 (19:57 +0000)]
Updated de_DE translation from Carsten Kurz.

6 years agoBump version
Carl Hetherington [Sun, 14 Jan 2018 02:28:34 +0000 (02:28 +0000)]
Bump version

6 years agoBump version v2.11.41
Carl Hetherington [Sun, 14 Jan 2018 02:28:34 +0000 (02:28 +0000)]
Bump version

6 years agoOnly put subtitles in a frame if they overlap more than half of that
Carl Hetherington [Sun, 14 Jan 2018 02:27:04 +0000 (02:27 +0000)]
Only put subtitles in a frame if they overlap more than half of that
frame; may help with #1166.

6 years agoEmit subtitles with correct times when they occur at different times within a frame...
Carl Hetherington [Sun, 14 Jan 2018 00:24:28 +0000 (00:24 +0000)]
Emit subtitles with correct times when they occur at different times within a frame period.

6 years agoFix crash when unsetting forced video frame rates in the timing panel.
Carl Hetherington [Sat, 13 Jan 2018 22:49:51 +0000 (22:49 +0000)]
Fix crash when unsetting forced video frame rates in the timing panel.

6 years agoFix typos affecting set-to behaviour.
Carl Hetherington [Sat, 13 Jan 2018 22:29:08 +0000 (22:29 +0000)]
Fix typos affecting set-to behaviour.

6 years agoFix thinko when writing XML.
Carl Hetherington [Sat, 13 Jan 2018 22:20:38 +0000 (22:20 +0000)]
Fix thinko when writing XML.

6 years agoBump libdcp for fix to negative halign/valign in DCP subtitles.
Carl Hetherington [Sat, 13 Jan 2018 21:21:01 +0000 (21:21 +0000)]
Bump libdcp for fix to negative halign/valign in DCP subtitles.

6 years agoi18n fuzzy fixes.
Carl Hetherington [Sat, 13 Jan 2018 02:18:38 +0000 (02:18 +0000)]
i18n fuzzy fixes.

6 years agopot/merge.
Carl Hetherington [Sat, 13 Jan 2018 01:41:23 +0000 (01:41 +0000)]
pot/merge.

6 years agoChangeLog.
Carl Hetherington [Sat, 13 Jan 2018 01:12:45 +0000 (01:12 +0000)]
ChangeLog.

6 years agoForcing for fade in/out.
Carl Hetherington [Sat, 13 Jan 2018 01:00:08 +0000 (01:00 +0000)]
Forcing for fade in/out.

6 years agoNote whether effect is forced or not.
Carl Hetherington [Fri, 12 Jan 2018 20:36:46 +0000 (20:36 +0000)]
Note whether effect is forced or not.

6 years agoUse an enum for the effect in SubtitleContent.
Carl Hetherington [Fri, 12 Jan 2018 13:24:52 +0000 (13:24 +0000)]
Use an enum for the effect in SubtitleContent.

6 years agoNote whether subtitle effect colour is forced or not.
Carl Hetherington [Fri, 12 Jan 2018 13:04:46 +0000 (13:04 +0000)]
Note whether subtitle effect colour is forced or not.

6 years agoNote whether subtitle colour is forced or not.
Carl Hetherington [Fri, 12 Jan 2018 12:48:50 +0000 (12:48 +0000)]
Note whether subtitle colour is forced or not.

6 years agoSupporter.
Carl Hetherington [Fri, 12 Jan 2018 22:41:06 +0000 (22:41 +0000)]
Supporter.

6 years agoSeparate readable error from technical detail in some places.
Carl Hetherington [Fri, 12 Jan 2018 22:30:43 +0000 (22:30 +0000)]
Separate readable error from technical detail in some places.

6 years agoFix crash when loading an incorrect KDM.
Carl Hetherington [Fri, 12 Jan 2018 21:29:00 +0000 (21:29 +0000)]
Fix crash when loading an incorrect KDM.

6 years agoDesensitize add OV/KDM when there is no loaded DCP.
Carl Hetherington [Fri, 12 Jan 2018 21:17:41 +0000 (21:17 +0000)]
Desensitize add OV/KDM when there is no loaded DCP.

6 years agoDon't throw an exception if we can't find bits_per_pixel, as it's not the end of...
Carl Hetherington [Fri, 12 Jan 2018 00:27:16 +0000 (00:27 +0000)]
Don't throw an exception if we can't find bits_per_pixel, as it's not the end of the world.

6 years agoFix crash due to alpha_blend requiring BGRA (#1165).
Carl Hetherington [Thu, 11 Jan 2018 00:58:33 +0000 (00:58 +0000)]
Fix crash due to alpha_blend requiring BGRA (#1165).

6 years agoUpdated nl_NL translation from Rob van Nieuwkerk.
Carl Hetherington [Thu, 11 Jan 2018 00:47:11 +0000 (00:47 +0000)]
Updated nl_NL translation from Rob van Nieuwkerk.

6 years agoMerge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Thu, 11 Jan 2018 00:45:29 +0000 (00:45 +0000)]
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

6 years agoHarden alpha blend tests and fix alpha_blend again.
Carl Hetherington [Thu, 11 Jan 2018 00:45:23 +0000 (00:45 +0000)]
Harden alpha blend tests and fix alpha_blend again.

6 years agoFix capitalisation.
Carl Hetherington [Wed, 10 Jan 2018 15:02:41 +0000 (15:02 +0000)]
Fix capitalisation.

6 years agoRemove bad fuzzy translation.
Carl Hetherington [Wed, 10 Jan 2018 10:00:13 +0000 (10:00 +0000)]
Remove bad fuzzy translation.

6 years agopot/merge.
Carl Hetherington [Wed, 10 Jan 2018 09:57:21 +0000 (09:57 +0000)]
pot/merge.

6 years agoBump version
Carl Hetherington [Wed, 10 Jan 2018 01:02:49 +0000 (01:02 +0000)]
Bump version

6 years agoBump version v2.11.40
Carl Hetherington [Wed, 10 Jan 2018 01:02:48 +0000 (01:02 +0000)]
Bump version

6 years agoFix yet more pixel order confusions.
Carl Hetherington [Wed, 10 Jan 2018 01:00:14 +0000 (01:00 +0000)]
Fix yet more pixel order confusions.

6 years agoFix some incorrect alpha blending; may help with #1155.
Carl Hetherington [Wed, 10 Jan 2018 00:25:47 +0000 (00:25 +0000)]
Fix some incorrect alpha blending; may help with #1155.

6 years agoMerge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Wed, 10 Jan 2018 00:00:24 +0000 (00:00 +0000)]
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

6 years agoHacky fix for crash introduced by subtitle appearance changes.
Carl Hetherington [Wed, 10 Jan 2018 00:00:13 +0000 (00:00 +0000)]
Hacky fix for crash introduced by subtitle appearance changes.

6 years agoBump version
Carl Hetherington [Tue, 9 Jan 2018 20:45:09 +0000 (20:45 +0000)]
Bump version

6 years agoBump version v2.11.39
Carl Hetherington [Tue, 9 Jan 2018 20:45:09 +0000 (20:45 +0000)]
Bump version

6 years agoFix forced-appearance for subs from DCPs (#1162).
Carl Hetherington [Tue, 9 Jan 2018 20:39:34 +0000 (20:39 +0000)]
Fix forced-appearance for subs from DCPs (#1162).

6 years agoMake overlapped fade in/out work more sensibly.
Carl Hetherington [Tue, 9 Jan 2018 20:38:47 +0000 (20:38 +0000)]
Make overlapped fade in/out work more sensibly.

6 years agoWhen doing jump-to-selected jump to the first subtitle in TextSubtitleContent (#1160).
Carl Hetherington [Mon, 8 Jan 2018 23:54:10 +0000 (23:54 +0000)]
When doing jump-to-selected jump to the first subtitle in TextSubtitleContent (#1160).

6 years agoFix a couple more crashes with incorrect KDMs (#1000).
Carl Hetherington [Mon, 8 Jan 2018 23:14:28 +0000 (23:14 +0000)]
Fix a couple more crashes with incorrect KDMs (#1000).

6 years agoMerge.
Carl Hetherington [Sun, 7 Jan 2018 02:09:29 +0000 (02:09 +0000)]
Merge.

6 years agoUpdated nl_NL translation from Rob van Nieuwkerk.
Carl Hetherington [Sun, 7 Jan 2018 02:08:40 +0000 (02:08 +0000)]
Updated nl_NL translation from Rob van Nieuwkerk.

6 years agoBump version
Carl Hetherington [Sun, 7 Jan 2018 00:38:23 +0000 (00:38 +0000)]
Bump version

6 years agoBump version v2.11.38
Carl Hetherington [Sun, 7 Jan 2018 00:38:23 +0000 (00:38 +0000)]
Bump version

6 years agoMake certificate re-creation cancellable and default nags
Carl Hetherington [Sun, 7 Jan 2018 00:02:00 +0000 (00:02 +0000)]
Make certificate re-creation cancellable and default nags
to not going away (#1158).

6 years agoFix crash when dragging and dropping the only DKDM.
Carl Hetherington [Sat, 6 Jan 2018 23:33:17 +0000 (23:33 +0000)]
Fix crash when dragging and dropping the only DKDM.

6 years agoCheck that we can decrypt a DKDM when it is loaded (#1011).
Carl Hetherington [Sat, 6 Jan 2018 23:27:45 +0000 (23:27 +0000)]
Check that we can decrypt a DKDM when it is loaded (#1011).

6 years agoCatch exceptions thrown when there are bad KDMs added to imported DCPs (#1000).
Carl Hetherington [Sat, 6 Jan 2018 23:10:02 +0000 (23:10 +0000)]
Catch exceptions thrown when there are bad KDMs added to imported DCPs (#1000).

6 years agoUpdated de_DE translation from Carsten Kurz.
Carl Hetherington [Sat, 6 Jan 2018 22:58:01 +0000 (22:58 +0000)]
Updated de_DE translation from Carsten Kurz.

6 years agoRemove check on whether the last seek was accurate when re-getting
Carl Hetherington [Sat, 6 Jan 2018 22:51:07 +0000 (22:51 +0000)]
Remove check on whether the last seek was accurate when re-getting
a frame.  This breaks things like changing crop after slidering to
a new position; at this point we don't care that the last seek was
inaccurate: the new one should be so that the frame stays the same.

6 years agoNo-op; remove some namespace qualifiers.
Carl Hetherington [Sat, 6 Jan 2018 22:22:40 +0000 (22:22 +0000)]
No-op; remove some namespace qualifiers.

6 years agoTry to improve the UI for decryption/signing keys by hiding
Carl Hetherington [Sat, 6 Jan 2018 22:18:31 +0000 (22:18 +0000)]
Try to improve the UI for decryption/signing keys by hiding
the details and hopefully providing buttons to do what 99% of
users will want to do (#1003).

6 years agoFix some bad fuzzy translations.
Carl Hetherington [Sat, 6 Jan 2018 19:30:41 +0000 (19:30 +0000)]
Fix some bad fuzzy translations.

6 years agoAdd player strings to i18n.
Carl Hetherington [Sat, 6 Jan 2018 19:07:38 +0000 (19:07 +0000)]
Add player strings to i18n.

6 years agoBump version
Carl Hetherington [Sat, 6 Jan 2018 01:28:49 +0000 (01:28 +0000)]
Bump version

6 years agoBump version v2.11.37
Carl Hetherington [Sat, 6 Jan 2018 01:28:49 +0000 (01:28 +0000)]
Bump version

6 years agoAdd version number to encode server welcome message (#1157).
Carl Hetherington [Sat, 6 Jan 2018 01:11:48 +0000 (01:11 +0000)]
Add version number to encode server welcome message (#1157).

6 years agoUpdated nl_NL translation from Rob van Nieuwkerk.
Carl Hetherington [Sat, 6 Jan 2018 01:05:17 +0000 (01:05 +0000)]
Updated nl_NL translation from Rob van Nieuwkerk.

6 years agoSome manual updates.
Carl Hetherington [Sat, 6 Jan 2018 00:51:49 +0000 (00:51 +0000)]
Some manual updates.

6 years agopot/merge.
Carl Hetherington [Fri, 5 Jan 2018 23:30:17 +0000 (23:30 +0000)]
pot/merge.

6 years agoAdd simple copy and paste for content settings (#1051).
Carl Hetherington [Fri, 5 Jan 2018 23:17:16 +0000 (23:17 +0000)]
Add simple copy and paste for content settings (#1051).

6 years agos/use_template/take_settings_from/g
Carl Hetherington [Fri, 5 Jan 2018 22:02:40 +0000 (22:02 +0000)]
s/use_template/take_settings_from/g

6 years agoMissing stop emission for fully-timed FFmpeg subtitles; should fix #1101.
Carl Hetherington [Fri, 5 Jan 2018 21:25:34 +0000 (21:25 +0000)]
Missing stop emission for fully-timed FFmpeg subtitles; should fix #1101.

6 years agoBackup more than one config on failure to load.
Carl Hetherington [Fri, 5 Jan 2018 20:03:43 +0000 (20:03 +0000)]
Backup more than one config on failure to load.

6 years agoMore splash screens / config warnings.
Carl Hetherington [Fri, 5 Jan 2018 19:24:06 +0000 (19:24 +0000)]
More splash screens / config warnings.

6 years agoMerge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Fri, 5 Jan 2018 18:57:56 +0000 (18:57 +0000)]
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

6 years agoMake player/KDM creator and main DCP-o-matic all behave the same with respect to...
Carl Hetherington [Fri, 5 Jan 2018 18:57:48 +0000 (18:57 +0000)]
Make player/KDM creator and main DCP-o-matic all behave the same with respect to problems when loading config.

6 years agoBump version
Carl Hetherington [Fri, 5 Jan 2018 13:53:45 +0000 (13:53 +0000)]
Bump version

6 years agoBump version v2.11.36
Carl Hetherington [Fri, 5 Jan 2018 13:53:45 +0000 (13:53 +0000)]
Bump version

6 years agoTry to fix build on older Ubuntus etc.
Carl Hetherington [Fri, 5 Jan 2018 13:15:37 +0000 (13:15 +0000)]
Try to fix build on older Ubuntus etc.

6 years agoSmall and somewhat untested optimisation.
Carl Hetherington [Fri, 5 Jan 2018 01:00:21 +0000 (01:00 +0000)]
Small and somewhat untested optimisation.

6 years agoDo read of image folders during the examine step; fixes #987.
Carl Hetherington [Thu, 4 Jan 2018 23:33:00 +0000 (23:33 +0000)]
Do read of image folders during the examine step; fixes #987.

6 years agoRecreate player pieces when changing FFmpeg filters (#1019).
Carl Hetherington [Thu, 4 Jan 2018 22:02:27 +0000 (22:02 +0000)]
Recreate player pieces when changing FFmpeg filters (#1019).

6 years agoSet up a default KDM write mode and preselect the last used one when re-opening the...
Carl Hetherington [Thu, 4 Jan 2018 21:26:18 +0000 (21:26 +0000)]
Set up a default KDM write mode and preselect the last used one when re-opening the KDM window (#1137).

6 years agoSupporter.
Carl Hetherington [Thu, 4 Jan 2018 20:21:06 +0000 (20:21 +0000)]
Supporter.

6 years agoTrying to use static libzip on OS X.
Carl Hetherington [Thu, 4 Jan 2018 02:04:04 +0000 (02:04 +0000)]
Trying to use static libzip on OS X.

6 years agoBump version
Carl Hetherington [Wed, 3 Jan 2018 15:50:24 +0000 (15:50 +0000)]
Bump version

6 years agoBump version v2.11.35
Carl Hetherington [Wed, 3 Jan 2018 15:50:24 +0000 (15:50 +0000)]
Bump version

6 years agoSupporter.
Carl Hetherington [Wed, 3 Jan 2018 15:50:09 +0000 (15:50 +0000)]
Supporter.

6 years agoFix alpha blending with with offset; should help with #1155.
Carl Hetherington [Wed, 3 Jan 2018 15:44:05 +0000 (15:44 +0000)]
Fix alpha blending with with offset; should help with #1155.

6 years agoFix incorrect alpha-blend in some cases.
Carl Hetherington [Wed, 3 Jan 2018 00:45:27 +0000 (00:45 +0000)]
Fix incorrect alpha-blend in some cases.

6 years agoWrite some test metadata for debugging.
Carl Hetherington [Wed, 3 Jan 2018 00:45:12 +0000 (00:45 +0000)]
Write some test metadata for debugging.

6 years agoSome more, simpler, subtitle export tests.
Carl Hetherington [Wed, 3 Jan 2018 00:08:48 +0000 (00:08 +0000)]
Some more, simpler, subtitle export tests.

6 years agoUse convert_pixel_format a little.
Carl Hetherington [Wed, 3 Jan 2018 00:00:06 +0000 (00:00 +0000)]
Use convert_pixel_format a little.

6 years agoAdd convert_pixel_format convenience function.
Carl Hetherington [Tue, 2 Jan 2018 23:35:43 +0000 (23:35 +0000)]
Add convert_pixel_format convenience function.

6 years agoExpand FFmpeg encoder subs tests.
Carl Hetherington [Tue, 2 Jan 2018 23:06:03 +0000 (23:06 +0000)]
Expand FFmpeg encoder subs tests.

6 years agoMark pieces as done when we're past the end of them; fixes #1154.
Carl Hetherington [Tue, 2 Jan 2018 21:21:43 +0000 (21:21 +0000)]
Mark pieces as done when we're past the end of them; fixes #1154.

6 years agoA previous commit took care to make Decoder::position() not be updated
Carl Hetherington [Tue, 2 Jan 2018 21:09:36 +0000 (21:09 +0000)]
A previous commit took care to make Decoder::position() not be updated
if the data that was emitted from the decoder was not taken by the player.

This means that when the decoder moves into its end trim the position will
stay where it is (since the player does not take the data).

I can't see the point of doing this; the only use of Decoder::position()
is to decide what to pass() next (I think).

It is also inconvenient because we would like to check Decoder::position()
to decide whether to stop passing a decoder since it's in its end trim
(not doing this causes #1154).

6 years agoNo need for position() to be virtual.
Carl Hetherington [Tue, 2 Jan 2018 20:56:04 +0000 (20:56 +0000)]
No need for position() to be virtual.

6 years agoAdd rewind-to-zero button to film viewer.
Carl Hetherington [Tue, 2 Jan 2018 18:45:39 +0000 (18:45 +0000)]
Add rewind-to-zero button to film viewer.