dcpomatic.git
7 years agoUse make_shared<>.
Carl Hetherington [Tue, 21 Jun 2016 00:14:06 +0000 (01:14 +0100)]
Use make_shared<>.

7 years agoBump libsub for .ass file fixes.
Carl Hetherington [Mon, 20 Jun 2016 21:49:38 +0000 (22:49 +0100)]
Bump libsub for .ass file fixes.

7 years agoPass .ass files to SSAReader.
Carl Hetherington [Mon, 20 Jun 2016 21:41:39 +0000 (22:41 +0100)]
Pass .ass files to SSAReader.

7 years agoFix crash when no video is being encoded.
Carl Hetherington [Mon, 20 Jun 2016 21:41:31 +0000 (22:41 +0100)]
Fix crash when no video is being encoded.

7 years agoBump libsub for SSA fixes.
Carl Hetherington [Mon, 20 Jun 2016 21:22:19 +0000 (22:22 +0100)]
Bump libsub for SSA fixes.

7 years agoUpdated nl_NL translation from Rob van Nieuwkerk.
Carl Hetherington [Mon, 20 Jun 2016 19:47:23 +0000 (20:47 +0100)]
Updated nl_NL translation from Rob van Nieuwkerk.

7 years agoFix missing code to display italic / bold font names.
Carl Hetherington [Mon, 20 Jun 2016 18:28:03 +0000 (19:28 +0100)]
Fix missing code to display italic / bold font names.

7 years agoBump libsub for space/tab fix.
Carl Hetherington [Mon, 20 Jun 2016 17:58:47 +0000 (18:58 +0100)]
Bump libsub for space/tab fix.

7 years agoHand-apply one pt_BR translation from Mx.
Carl Hetherington [Mon, 20 Jun 2016 17:57:55 +0000 (18:57 +0100)]
Hand-apply one pt_BR translation from Mx.

7 years agopot/merge.
Carl Hetherington [Mon, 20 Jun 2016 16:33:08 +0000 (17:33 +0100)]
pot/merge.

7 years agoUpdated pt_BR translation from Max M. Fuhlendorf.
Carl Hetherington [Mon, 20 Jun 2016 16:32:57 +0000 (17:32 +0100)]
Updated pt_BR translation from Max M. Fuhlendorf.

7 years agoAdd another translator.
Carl Hetherington [Mon, 20 Jun 2016 16:32:50 +0000 (17:32 +0100)]
Add another translator.

7 years agopot/merge.
Carl Hetherington [Mon, 20 Jun 2016 16:29:21 +0000 (17:29 +0100)]
pot/merge.

7 years agoChangeLog.
Carl Hetherington [Mon, 20 Jun 2016 16:29:09 +0000 (17:29 +0100)]
ChangeLog.

7 years agoMerge branch 'fix-encoder-threading' of ssh://git.carlh.net/home/carl/git/dcpomatic...
Carl Hetherington [Mon, 20 Jun 2016 16:16:20 +0000 (17:16 +0100)]
Merge branch 'fix-encoder-threading' of ssh://git.carlh.net/home/carl/git/dcpomatic into fix-encoder-threading

7 years agoFix encoder thread interruption.
Carl Hetherington [Mon, 20 Jun 2016 16:15:07 +0000 (17:15 +0100)]
Fix encoder thread interruption.

When an encoder thread is interrupted we just want it silently
to stop, so catch boost::thread_interrupted separately and don't
pass it on.

I believe the interruption of jobs and subsequent catch of
boost::thread_interrupted will still work as that's the job thread
rather than the encoder threads.

7 years agoFix another case where an exception could be thrown from a destructor.
Carl Hetherington [Mon, 20 Jun 2016 16:06:58 +0000 (17:06 +0100)]
Fix another case where an exception could be thrown from a destructor.

7 years agoEncoder shutdown fixes.
Carl Hetherington [Mon, 20 Jun 2016 14:02:15 +0000 (15:02 +0100)]
Encoder shutdown fixes.

Two fixes here; prevent the servers-list-changed callback being
called when Encoder is being destroyed, and stop ~Encoder throwing
exceptions.

I'm not sure if the catch (...) in ~Encoder will hide problems
that we should be handling, but I think by the time ~Encoder
is happening we'll already have seen any exceptions that we
need to report.

7 years agoBump version
Carl Hetherington [Sun, 19 Jun 2016 21:17:51 +0000 (22:17 +0100)]
Bump version

7 years agoBump version v2.8.12
Carl Hetherington [Sun, 19 Jun 2016 21:17:51 +0000 (22:17 +0100)]
Bump version

7 years agoRender bold subtitles correctly in preview / burn-in.
Carl Hetherington [Sun, 19 Jun 2016 21:11:25 +0000 (22:11 +0100)]
Render bold subtitles correctly in preview / burn-in.

7 years agoBump libsub for fixes to SSA/ASS parsing.
Carl Hetherington [Sun, 19 Jun 2016 20:58:47 +0000 (21:58 +0100)]
Bump libsub for fixes to SSA/ASS parsing.

7 years agoUpdated pt_BR translation from Max M. Fuhlendorf.
Carl Hetherington [Sun, 19 Jun 2016 20:23:48 +0000 (21:23 +0100)]
Updated pt_BR translation from Max M. Fuhlendorf.

7 years agoBump version
Carl Hetherington [Sun, 19 Jun 2016 20:10:23 +0000 (21:10 +0100)]
Bump version

7 years agoBump version v2.8.11
Carl Hetherington [Sun, 19 Jun 2016 20:10:23 +0000 (21:10 +0100)]
Bump version

7 years agoMerge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Sun, 19 Jun 2016 20:10:06 +0000 (21:10 +0100)]
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

7 years agoMissing Windows dependency.
Carl Hetherington [Sun, 19 Jun 2016 20:08:47 +0000 (21:08 +0100)]
Missing Windows dependency.

7 years agoBump version
Carl Hetherington [Sat, 18 Jun 2016 23:43:52 +0000 (00:43 +0100)]
Bump version

7 years agoBump version v2.8.10
Carl Hetherington [Sat, 18 Jun 2016 23:43:52 +0000 (00:43 +0100)]
Bump version

7 years agoParse .ass files using the text subtitle code.
Carl Hetherington [Sat, 18 Jun 2016 22:53:02 +0000 (23:53 +0100)]
Parse .ass files using the text subtitle code.

7 years agoFix special cscript build for Windows XP.
Carl Hetherington [Sat, 18 Jun 2016 21:21:43 +0000 (22:21 +0100)]
Fix special cscript build for Windows XP.

7 years agoSupporter.
Carl Hetherington [Sat, 18 Jun 2016 20:09:58 +0000 (21:09 +0100)]
Supporter.

7 years agoTry to fix 64-bit centos link of nettle.
Carl Hetherington [Fri, 17 Jun 2016 23:47:49 +0000 (00:47 +0100)]
Try to fix 64-bit centos link of nettle.

7 years agoUse wx_to_std and std_to_wx for now.
Carl Hetherington [Fri, 17 Jun 2016 23:02:22 +0000 (00:02 +0100)]
Use wx_to_std and std_to_wx for now.

7 years agoAdd preference for the default number of DCP channels (#897).
Carl Hetherington [Fri, 17 Jun 2016 22:22:06 +0000 (23:22 +0100)]
Add preference for the default number of DCP channels (#897).

7 years agoMissing virtual destructor.
Carl Hetherington [Fri, 17 Jun 2016 15:49:05 +0000 (16:49 +0100)]
Missing virtual destructor.

7 years agoFix typo in previous.
Carl Hetherington [Thu, 16 Jun 2016 21:15:16 +0000 (22:15 +0100)]
Fix typo in previous.

7 years agoSupporter.
Carl Hetherington [Thu, 16 Jun 2016 20:51:35 +0000 (21:51 +0100)]
Supporter.

7 years agoIgnore any hidden files when looking for images.
Carl Hetherington [Thu, 16 Jun 2016 00:02:10 +0000 (01:02 +0100)]
Ignore any hidden files when looking for images.

We used to do ._* and .DS_Store but there has been a report of
.com.apple.timemachine.supported.

7 years agoPotential fix for crash on loading a new film after starting an audio analysis.
Carl Hetherington [Wed, 15 Jun 2016 23:51:15 +0000 (00:51 +0100)]
Potential fix for crash on loading a new film after starting an audio analysis.

7 years agoRemove seconds from KDM time period specification (#819).
Carl Hetherington [Wed, 15 Jun 2016 23:46:26 +0000 (00:46 +0100)]
Remove seconds from KDM time period specification (#819).

7 years agoBump libdcp for dep fix.
Carl Hetherington [Wed, 15 Jun 2016 21:41:19 +0000 (22:41 +0100)]
Bump libdcp for dep fix.

7 years agoBump libdcp for the return of OpenJPEG 1.5.x.
Carl Hetherington [Tue, 14 Jun 2016 20:49:05 +0000 (21:49 +0100)]
Bump libdcp for the return of OpenJPEG 1.5.x.

7 years agoBasic guessing of audio channels from filenames (#393).
Carl Hetherington [Tue, 14 Jun 2016 14:51:03 +0000 (15:51 +0100)]
Basic guessing of audio channels from filenames (#393).

7 years agoClean up of 3D->2D conversion.
Carl Hetherington [Tue, 14 Jun 2016 14:07:58 +0000 (15:07 +0100)]
Clean up of 3D->2D conversion.

It makes slightly more sense to discard 2D in the Transcoder
rather than the Encoder.  Unfortunately this requires quite
invasive changes, mainly to remove Encoder::_position and instead
derive this information from the PlayerVideo that is being handled.
This is also nicer than before, I think.

A notable change is that in player.cc; using time rather than
content_video_to_dcp().  This means we are assuming that the decoder
returns video at the time we ask it to, rather than checking
what it has returned.  I can't think of a problem with this (yet).

7 years agoBump cscript for libdcp whitespace/tab fix.
Carl Hetherington [Tue, 14 Jun 2016 13:10:13 +0000 (14:10 +0100)]
Bump cscript for libdcp whitespace/tab fix.

7 years agoUpdate for state file version change.
Carl Hetherington [Tue, 14 Jun 2016 12:43:43 +0000 (13:43 +0100)]
Update for state file version change.

7 years agoDiscard right-eye images when using 3D sources to make 2D DCPs.
Carl Hetherington [Tue, 14 Jun 2016 11:58:57 +0000 (12:58 +0100)]
Discard right-eye images when using 3D sources to make 2D DCPs.

7 years agoUse edit rate not frame rate for displaying rate of DCPs.
Carl Hetherington [Tue, 14 Jun 2016 11:35:20 +0000 (12:35 +0100)]
Use edit rate not frame rate for displaying rate of DCPs.

7 years agoFix subtle bug with 3D and add a explicit to stop it happening again.
Carl Hetherington [Tue, 14 Jun 2016 11:21:40 +0000 (12:21 +0100)]
Fix subtle bug with 3D and add a explicit to stop it happening again.

7 years agoSet correct video frame type when importing DCPs (part of #806).
Carl Hetherington [Tue, 14 Jun 2016 11:11:50 +0000 (12:11 +0100)]
Set correct video frame type when importing DCPs (part of #806).

7 years agoFix some confusion with filling and VideoFrame.
Carl Hetherington [Tue, 14 Jun 2016 11:10:59 +0000 (12:10 +0100)]
Fix some confusion with filling and VideoFrame.

7 years agoAdd VideoFrame class.
Carl Hetherington [Tue, 14 Jun 2016 10:48:37 +0000 (11:48 +0100)]
Add VideoFrame class.

This puts a frame index with an Eyes, which simplifies code in
some areas.  I can't think of a better name for it,
unfortunately.

7 years agoMerge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Tue, 14 Jun 2016 08:34:09 +0000 (09:34 +0100)]
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

7 years agoTest fix.
Carl Hetherington [Tue, 14 Jun 2016 00:03:43 +0000 (01:03 +0100)]
Test fix.

7 years agoBump libdcp for various fixes to Interop subtitle time parsing.
Carl Hetherington [Mon, 13 Jun 2016 23:25:34 +0000 (00:25 +0100)]
Bump libdcp for various fixes to Interop subtitle time parsing.

7 years agoSilly mistake in previous.
Carl Hetherington [Mon, 13 Jun 2016 23:10:54 +0000 (00:10 +0100)]
Silly mistake in previous.

7 years agoTry to fix build.
Carl Hetherington [Mon, 13 Jun 2016 22:59:04 +0000 (23:59 +0100)]
Try to fix build.

7 years agoImprove error messages on failing to load DCP subs.
Carl Hetherington [Mon, 13 Jun 2016 22:12:18 +0000 (23:12 +0100)]
Improve error messages on failing to load DCP subs.

7 years agoFix VideoDecoder::get_video() with 3D.
Carl Hetherington [Mon, 13 Jun 2016 15:09:07 +0000 (16:09 +0100)]
Fix VideoDecoder::get_video() with 3D.

get_video() promises to return all video frames at the given time,
but this wasn't working for none-SBS-3D as it would be satisfied
when it got the first (left) frame.  Adjust get_video() to get all
required frames.

This showed up bugs in fill_both_eyes, whereby the from parameter
was ignored and the wrong things were done in some cases;
video_decoder_fill_test.cc tests this stuff.

7 years agoAdd 3D video frame type for, e.g. 3D DCP inputs (part of #806).
Carl Hetherington [Mon, 13 Jun 2016 15:08:22 +0000 (16:08 +0100)]
Add 3D video frame type for, e.g. 3D DCP inputs (part of #806).

7 years agoRemove caching of old ImageDecoder objects.
Carl Hetherington [Mon, 13 Jun 2016 13:38:12 +0000 (14:38 +0100)]
Remove caching of old ImageDecoder objects.

This breaks things when there is a 3D ImageContent.  When
you change the video frame type on this content the view
does not update because the re-used ImageDecoder recycles
the same video without noticing that the frame type has changed.

I guess this is sort of `because' the video frame type is used
in VideoDecoder::give, which sets up the cache.

Unfortunately I can't remember the case which the caching
of ImageDecoders was meant to speed up.  Maybe this will
now become apparent.

7 years agoMake storage of VideoFrameType robust by using a string in the XML rather than a...
Carl Hetherington [Mon, 13 Jun 2016 12:48:45 +0000 (13:48 +0100)]
Make storage of VideoFrameType robust by using a string in the XML rather than a casted enum.

7 years agoBump libdcp for licence statement changes wrt OpenSSL.
Carl Hetherington [Mon, 13 Jun 2016 11:43:03 +0000 (12:43 +0100)]
Bump libdcp for licence statement changes wrt OpenSSL.

7 years agoFix previous.
Carl Hetherington [Mon, 13 Jun 2016 11:38:59 +0000 (12:38 +0100)]
Fix previous.

7 years agoUse nettle rather then openssl for MD5 digesting.
Carl Hetherington [Mon, 13 Jun 2016 11:23:37 +0000 (12:23 +0100)]
Use nettle rather then openssl for MD5 digesting.

7 years agoRename MD5Digester -> Digester.
Carl Hetherington [Mon, 13 Jun 2016 11:17:47 +0000 (12:17 +0100)]
Rename MD5Digester -> Digester.

7 years agoAdd SSA subtitle test.
Carl Hetherington [Mon, 13 Jun 2016 10:34:10 +0000 (11:34 +0100)]
Add SSA subtitle test.

7 years agoAdd button to move things to the start of reels (#798).
Carl Hetherington [Mon, 13 Jun 2016 09:54:02 +0000 (10:54 +0100)]
Add button to move things to the start of reels (#798).

7 years agoBump libsub for various improvements.
Carl Hetherington [Sat, 11 Jun 2016 22:43:06 +0000 (23:43 +0100)]
Bump libsub for various improvements.

7 years agoFix supporter name.
Carl Hetherington [Sat, 11 Jun 2016 22:39:51 +0000 (23:39 +0100)]
Fix supporter name.

7 years agoSupporter.
Carl Hetherington [Sat, 11 Jun 2016 20:44:26 +0000 (21:44 +0100)]
Supporter.

7 years agoNew cdist can run a specific test.
Carl Hetherington [Fri, 10 Jun 2016 22:21:45 +0000 (23:21 +0100)]
New cdist can run a specific test.

7 years agoVarious updates for subtitle changes.
Carl Hetherington [Fri, 10 Jun 2016 14:53:12 +0000 (15:53 +0100)]
Various updates for subtitle changes.

7 years agoGo back to referencing subrip from the top of the frame.
Carl Hetherington [Fri, 10 Jun 2016 13:41:51 +0000 (14:41 +0100)]
Go back to referencing subrip from the top of the frame.

7 years agoTweak subrip position.
Carl Hetherington [Fri, 10 Jun 2016 10:26:07 +0000 (11:26 +0100)]
Tweak subrip position.

7 years agoFix positioning of SubRip.
Carl Hetherington [Fri, 10 Jun 2016 10:07:44 +0000 (11:07 +0100)]
Fix positioning of SubRip.

7 years agoSpecify a default font size if none comes from libsub.
Carl Hetherington [Fri, 10 Jun 2016 09:20:37 +0000 (10:20 +0100)]
Specify a default font size if none comes from libsub.
Use the specified time period rather than looking
in the Subtitle.

7 years agoRemove some debug code.
Carl Hetherington [Thu, 9 Jun 2016 23:38:49 +0000 (00:38 +0100)]
Remove some debug code.

7 years agoFix thinko.
Carl Hetherington [Thu, 9 Jun 2016 23:34:43 +0000 (00:34 +0100)]
Fix thinko.

7 years agoFix some code duplication and crashes when decoding FFmpeg-embedded ASS subtitles...
Carl Hetherington [Thu, 9 Jun 2016 22:28:41 +0000 (23:28 +0100)]
Fix some code duplication and crashes when decoding FFmpeg-embedded ASS subtitles along the way.

7 years agoRemove unused code.
Carl Hetherington [Thu, 9 Jun 2016 21:53:28 +0000 (22:53 +0100)]
Remove unused code.

7 years agoMerge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Carl Hetherington [Thu, 9 Jun 2016 21:21:14 +0000 (22:21 +0100)]
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

7 years agoPartial work on fixing vertical positioning of subtitles with the new libsub.
Carl Hetherington [Thu, 9 Jun 2016 21:20:39 +0000 (22:20 +0100)]
Partial work on fixing vertical positioning of subtitles with the new libsub.

7 years agoBump libsub for build fix.
Carl Hetherington [Thu, 9 Jun 2016 21:09:42 +0000 (22:09 +0100)]
Bump libsub for build fix.

7 years agoBump dcp/sub for asdcplib update.
Carl Hetherington [Thu, 9 Jun 2016 19:25:40 +0000 (20:25 +0100)]
Bump dcp/sub for asdcplib update.

7 years agoBump libsub for asdcplib-cth.
Carl Hetherington [Thu, 9 Jun 2016 15:27:08 +0000 (16:27 +0100)]
Bump libsub for asdcplib-cth.

7 years agoBump libdcp for asdcplib-cth Centos 5 fix.
Carl Hetherington [Thu, 9 Jun 2016 15:18:40 +0000 (16:18 +0100)]
Bump libdcp for asdcplib-cth Centos 5 fix.

7 years agoBump version
Carl Hetherington [Wed, 8 Jun 2016 22:23:14 +0000 (23:23 +0100)]
Bump version

7 years agoBump version v2.8.9
Carl Hetherington [Wed, 8 Jun 2016 22:23:14 +0000 (23:23 +0100)]
Bump version

7 years agoRevert accidentally-committed test patch.
Carl Hetherington [Wed, 8 Jun 2016 20:45:33 +0000 (21:45 +0100)]
Revert accidentally-committed test patch.

7 years agoFix build on Windows.
Carl Hetherington [Tue, 7 Jun 2016 15:57:29 +0000 (16:57 +0100)]
Fix build on Windows.

7 years agoRemove some flawed condition manipulation.
Carl Hetherington [Tue, 7 Jun 2016 15:05:43 +0000 (16:05 +0100)]
Remove some flawed condition manipulation.

I think this stuff is unnecessary as wait() is interruptible
by boost::thread::interrupt.  Hence instead of setting a flag
then signalling the condition we can just do interrupt(), the
exception will be thrown and that's that.

7 years agoReplace a shared_ptr with a weak_ptr.
Carl Hetherington [Tue, 7 Jun 2016 15:03:38 +0000 (16:03 +0100)]
Replace a shared_ptr with a weak_ptr.

7 years agoAdd new test.
Carl Hetherington [Tue, 7 Jun 2016 15:03:01 +0000 (16:03 +0100)]
Add new test.

7 years agoRemove unused method.
Carl Hetherington [Tue, 7 Jun 2016 15:02:49 +0000 (16:02 +0100)]
Remove unused method.

7 years agoBump test/data for metadata version tweak.
Carl Hetherington [Tue, 7 Jun 2016 10:12:07 +0000 (11:12 +0100)]
Bump test/data for metadata version tweak.

7 years agoAdd tooltips over content channel names in the audio mapping view (#888).
Carl Hetherington [Tue, 7 Jun 2016 10:10:41 +0000 (11:10 +0100)]
Add tooltips over content channel names in the audio mapping view (#888).

7 years agoRe-add option to save DKDMs to a file.
Carl Hetherington [Tue, 7 Jun 2016 09:34:25 +0000 (10:34 +0100)]
Re-add option to save DKDMs to a file.

7 years agoUpdated nl_NL translation from Rob van Nieuwkerk.
Carl Hetherington [Mon, 6 Jun 2016 20:20:51 +0000 (21:20 +0100)]
Updated nl_NL translation from Rob van Nieuwkerk.