dcpomatic.git
8 years agoVarious bits related to subtitle font handling, particularly copying fonts to the...
Carl Hetherington [Thu, 30 Apr 2015 21:20:57 +0000 (22:20 +0100)]
Various bits related to subtitle font handling, particularly copying fonts to the DCP.

8 years agoMerge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Thu, 30 Apr 2015 16:58:39 +0000 (17:58 +0100)]
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

8 years agoBump libdcp.
Carl Hetherington [Thu, 30 Apr 2015 16:58:31 +0000 (17:58 +0100)]
Bump libdcp.

8 years agoFix check_xml that ignored attributes.
Carl Hetherington [Thu, 30 Apr 2015 14:31:14 +0000 (15:31 +0100)]
Fix check_xml that ignored attributes.

8 years agoFix some missing enable/disable in the video panel.
Carl Hetherington [Wed, 29 Apr 2015 22:46:39 +0000 (23:46 +0100)]
Fix some missing enable/disable in the video panel.

8 years agoTO_PORT.
Carl Hetherington [Wed, 29 Apr 2015 22:09:04 +0000 (23:09 +0100)]
TO_PORT.

8 years agoTO_PORT.
Carl Hetherington [Wed, 29 Apr 2015 22:07:47 +0000 (23:07 +0100)]
TO_PORT.

8 years agoHand-apply 0faa096dd8e3f8a5ba3975a88aaf6d1994866604 from master; improve disk space...
Carl Hetherington [Wed, 29 Apr 2015 22:07:27 +0000 (23:07 +0100)]
Hand-apply 0faa096dd8e3f8a5ba3975a88aaf6d1994866604 from master; improve disk space check wrt hard links.

8 years agoHand-apply 62f8054d65a8bd31689fc0c977c1bb2385e71afa from master; config of encryption...
Carl Hetherington [Wed, 29 Apr 2015 21:53:52 +0000 (22:53 +0100)]
Hand-apply 62f8054d65a8bd31689fc0c977c1bb2385e71afa from master; config of encryption key.

8 years agoTO_PORT.
Carl Hetherington [Wed, 29 Apr 2015 21:19:25 +0000 (22:19 +0100)]
TO_PORT.

8 years agoBump SERVER_LINK_VERSION after ColourConversion changes.
Carl Hetherington [Wed, 29 Apr 2015 21:18:51 +0000 (22:18 +0100)]
Bump SERVER_LINK_VERSION after ColourConversion changes.

8 years agoHand-apply 2ee558ec90623b570360e8e55c918b5bb37f9aac from master; various snapping...
Carl Hetherington [Wed, 29 Apr 2015 21:17:16 +0000 (22:17 +0100)]
Hand-apply 2ee558ec90623b570360e8e55c918b5bb37f9aac from master; various snapping fixes.

8 years agoHand-apply a2f776bd239ef1a744c1a9fea841ac0a51c4f33b from master; more deflickering.
Carl Hetherington [Wed, 29 Apr 2015 21:14:46 +0000 (22:14 +0100)]
Hand-apply a2f776bd239ef1a744c1a9fea841ac0a51c4f33b from master; more deflickering.

8 years agoHand-apply b737b25e10a4bcfb8cb645e95a089192347b4805 from master; more deflickering.
Carl Hetherington [Wed, 29 Apr 2015 21:10:50 +0000 (22:10 +0100)]
Hand-apply b737b25e10a4bcfb8cb645e95a089192347b4805 from master; more deflickering.

8 years agoHand-apply 077d2abb480a883119783db3f957f175e22e543b from master; stop more flickering...
Carl Hetherington [Wed, 29 Apr 2015 14:22:29 +0000 (15:22 +0100)]
Hand-apply 077d2abb480a883119783db3f957f175e22e543b from master; stop more flickering when dragging in the timeline in OS X.

9 years agoMerge TO_PORT.
Carl Hetherington [Wed, 29 Apr 2015 12:31:29 +0000 (13:31 +0100)]
Merge TO_PORT.

9 years agoTO_PORT.
Carl Hetherington [Wed, 29 Apr 2015 12:31:04 +0000 (13:31 +0100)]
TO_PORT.

9 years agoTested by.
Carl Hetherington [Fri, 24 Apr 2015 21:27:53 +0000 (22:27 +0100)]
Tested by.

9 years agoTO_PORT.
Carl Hetherington [Fri, 24 Apr 2015 21:27:07 +0000 (22:27 +0100)]
TO_PORT.

9 years agoMerge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Fri, 24 Apr 2015 21:26:26 +0000 (22:26 +0100)]
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

9 years agoFix crash due to static initialisation order nastiness.
Carl Hetherington [Fri, 24 Apr 2015 21:26:13 +0000 (22:26 +0100)]
Fix crash due to static initialisation order nastiness.

9 years agoFix test since colour conversion changes.
Carl Hetherington [Fri, 24 Apr 2015 14:12:54 +0000 (15:12 +0100)]
Fix test since colour conversion changes.

9 years agoTO_PORT.
Carl Hetherington [Fri, 24 Apr 2015 12:54:08 +0000 (13:54 +0100)]
TO_PORT.

9 years agoTO_PORT.
Carl Hetherington [Fri, 24 Apr 2015 12:36:42 +0000 (13:36 +0100)]
TO_PORT.

9 years agoMerge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Fri, 24 Apr 2015 11:05:21 +0000 (12:05 +0100)]
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

9 years agoTO_PORT.
Carl Hetherington [Fri, 24 Apr 2015 11:05:17 +0000 (12:05 +0100)]
TO_PORT.

9 years agoUpdate test for new colour conversion code.
Carl Hetherington [Thu, 23 Apr 2015 18:03:33 +0000 (19:03 +0100)]
Update test for new colour conversion code.

9 years agoMerge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Thu, 23 Apr 2015 16:55:08 +0000 (17:55 +0100)]
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

9 years agoAdd Jianguo Huang as author.
Carl Hetherington [Thu, 23 Apr 2015 16:55:01 +0000 (17:55 +0100)]
Add Jianguo Huang as author.

9 years agoAdd P3 colour conversion preset.
Carl Hetherington [Wed, 22 Apr 2015 14:59:36 +0000 (15:59 +0100)]
Add P3 colour conversion preset.

9 years agoActually use YUV->RGB setting when converting.
Carl Hetherington [Wed, 22 Apr 2015 14:35:34 +0000 (15:35 +0100)]
Actually use YUV->RGB setting when converting.

9 years agoBump libdcp dep.
Carl Hetherington [Wed, 22 Apr 2015 14:03:06 +0000 (15:03 +0100)]
Bump libdcp dep.

9 years agoFix ID numbering.
Carl Hetherington [Wed, 22 Apr 2015 13:58:30 +0000 (14:58 +0100)]
Fix ID numbering.

9 years agoVarious changes to colour conversion specification to use chromaticities.
Carl Hetherington [Wed, 22 Apr 2015 12:58:04 +0000 (13:58 +0100)]
Various changes to colour conversion specification to use chromaticities.

9 years agoSupporters.
Carl Hetherington [Tue, 21 Apr 2015 21:51:13 +0000 (22:51 +0100)]
Supporters.

9 years agolibdcp1 gamma correction for Rec.709 was changed from 2.4 to 2.222222...
Carl Hetherington [Tue, 21 Apr 2015 10:46:20 +0000 (11:46 +0100)]
libdcp1 gamma correction for Rec.709 was changed from 2.4 to 2.222222...

9 years agoTO_PORT.
Carl Hetherington [Tue, 21 Apr 2015 10:40:59 +0000 (11:40 +0100)]
TO_PORT.

9 years agoHand-apply dbaf6da70557cc94550e95130cb697ce6a100586 from master;
Carl Hetherington [Tue, 21 Apr 2015 10:39:55 +0000 (11:39 +0100)]
Hand-apply dbaf6da70557cc94550e95130cb697ce6a100586 from master;
use the picture MXF's filename decided at the start of the encode
the whole way through the encode.

9 years agoBump libdcp.
Carl Hetherington [Tue, 21 Apr 2015 09:33:47 +0000 (10:33 +0100)]
Bump libdcp.

9 years agoHand-apply bd7102b476c631b1fa9067f18ce938d86073f6c8; single-file hashes.
Carl Hetherington [Tue, 21 Apr 2015 00:00:36 +0000 (01:00 +0100)]
Hand-apply bd7102b476c631b1fa9067f18ce938d86073f6c8; single-file hashes.

9 years agoUpdate to-port.
Carl Hetherington [Mon, 20 Apr 2015 22:06:35 +0000 (23:06 +0100)]
Update to-port.

9 years agoHand-apply 9a90f25eb891d7d590563c0ce1597de4da8ff575; bind to
Carl Hetherington [Mon, 20 Apr 2015 22:03:02 +0000 (23:03 +0100)]
Hand-apply 9a90f25eb891d7d590563c0ce1597de4da8ff575; bind to
wxEVT_COMMAND_TEXT_UPDATED as well as wxEVT_COMMAND_SPINCTRL_UPDATED
on the JPEG2000 control otherwise entering a value using the keyboard
directly before doing "Make DCP" can seemingly result in the new value
not being read in until after the video MXF filename has been decided.
This results in a file not found at the end of the encode.

9 years agoto-port.
Carl Hetherington [Mon, 20 Apr 2015 20:11:33 +0000 (21:11 +0100)]
to-port.

9 years agoTO_PORT.
Carl Hetherington [Sun, 19 Apr 2015 12:17:52 +0000 (13:17 +0100)]
TO_PORT.

9 years agoAdd our own raw_convert that uses SafeStringStream.
Carl Hetherington [Thu, 16 Apr 2015 22:10:28 +0000 (23:10 +0100)]
Add our own raw_convert that uses SafeStringStream.

9 years agoA few missing checks on the return value of fopen_boost.
Carl Hetherington [Thu, 16 Apr 2015 08:56:12 +0000 (09:56 +0100)]
A few missing checks on the return value of fopen_boost.

9 years agoMerge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Thu, 16 Apr 2015 08:20:56 +0000 (09:20 +0100)]
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

9 years agoUpdate TO_PORT.
Carl Hetherington [Wed, 15 Apr 2015 23:00:46 +0000 (00:00 +0100)]
Update TO_PORT.

9 years agoApply 9d49a592519fc7f0141e2a1a9fee0043776952ac; fix drag-and-drop and sort image...
Carl Hetherington [Wed, 15 Apr 2015 23:00:26 +0000 (00:00 +0100)]
Apply 9d49a592519fc7f0141e2a1a9fee0043776952ac; fix drag-and-drop and sort image filenames.

9 years agoMerge.
Carl Hetherington [Wed, 15 Apr 2015 17:46:13 +0000 (18:46 +0100)]
Merge.

9 years agoAdd TO_PORT.
Carl Hetherington [Wed, 15 Apr 2015 17:46:00 +0000 (18:46 +0100)]
Add TO_PORT.

9 years agoCatch case where fopen_boost returns 0 in fake_write.
Carl Hetherington [Wed, 15 Apr 2015 15:43:31 +0000 (16:43 +0100)]
Catch case where fopen_boost returns 0 in fake_write.

9 years ago00cc8646894f6519d1e2726f3e7a4fbc1e11d8f3 from master; make the config dialog update...
Carl Hetherington [Wed, 15 Apr 2015 15:35:32 +0000 (16:35 +0100)]
00cc8646894f6519d1e2726f3e7a4fbc1e11d8f3 from master; make the config dialog update itself when the configuration changes, and add a menu option to restore the default configuration.

9 years agoto port.
Carl Hetherington [Wed, 15 Apr 2015 09:30:24 +0000 (10:30 +0100)]
to port.

9 years agoUpdate TO_PORT.
Carl Hetherington [Mon, 13 Apr 2015 10:17:49 +0000 (11:17 +0100)]
Update TO_PORT.

9 years agoUpdate ratio_test for removed ratio.
Carl Hetherington [Sun, 12 Apr 2015 19:57:10 +0000 (20:57 +0100)]
Update ratio_test for removed ratio.

9 years agoFix recover_test.
Carl Hetherington [Sun, 12 Apr 2015 17:49:12 +0000 (18:49 +0100)]
Fix recover_test.

9 years agoFix ISDCF name test and add check to see if a mapped channel is included in the DCP.
Carl Hetherington [Sun, 12 Apr 2015 17:35:49 +0000 (18:35 +0100)]
Fix ISDCF name test and add check to see if a mapped channel is included in the DCP.

9 years agoUpdate TO_PORT.
Carl Hetherington [Sun, 12 Apr 2015 16:35:13 +0000 (17:35 +0100)]
Update TO_PORT.

9 years agoHand-apply c165ea8ccadf5bb8c4401a23bb2e998fabdc8a9b from master.
Carl Hetherington [Sun, 12 Apr 2015 16:35:02 +0000 (17:35 +0100)]
Hand-apply c165ea8ccadf5bb8c4401a23bb2e998fabdc8a9b from 

9 years agoApplied a patch from master, so update TO_PORT.
Carl Hetherington [Sun, 12 Apr 2015 16:28:15 +0000 (17:28 +0100)]
Applied a patch from master, so update TO_PORT.

9 years agoHand-apply bb070db1b36020058b010057b08ae78e6243d2d0 from master.
Carl Hetherington [Sun, 12 Apr 2015 16:27:58 +0000 (17:27 +0100)]
Hand-apply bb070db1b36020058b010057b08ae78e6243d2d0 from 

9 years agoHand-apply 1b68e4de5260a08e7f06a1b802cfc7eb41cd4be8 from master.
Carl Hetherington [Sun, 12 Apr 2015 16:23:50 +0000 (17:23 +0100)]
Hand-apply 1b68e4de5260a08e7f06a1b802cfc7eb41cd4be8 from 

9 years agoHand-apply 97dde0e6d77b874742161703944d60524023664e from master.
Carl Hetherington [Sun, 12 Apr 2015 16:20:10 +0000 (17:20 +0100)]
Hand-apply 97dde0e6d77b874742161703944d60524023664e from 

9 years agoReasonably confident that bb206658c308eb436f3ffc40cb13e2076bd1a249 does not have...
Carl Hetherington [Sun, 12 Apr 2015 16:07:28 +0000 (17:07 +0100)]
Reasonably confident that bb206658c308eb436f3ffc40cb13e2076bd1a249 does not have to be ported.

9 years agoFix test data now that Scaler is not specified.
Carl Hetherington [Wed, 25 Mar 2015 22:35:12 +0000 (22:35 +0000)]
Fix test data now that Scaler is not specified.

9 years agoFix TO_PORT.
Carl Hetherington [Wed, 25 Mar 2015 00:46:02 +0000 (00:46 +0000)]
Fix TO_PORT.

9 years agoRemove Scaler config and use SWS_BICUBIC everywhere.
Carl Hetherington [Wed, 25 Mar 2015 00:41:05 +0000 (00:41 +0000)]
Remove Scaler config and use SWS_BICUBIC everywhere.

9 years agoHand-apply ec3e6abf817b84d589f0782b01f5059dd3bf0953; only allow even
Carl Hetherington [Wed, 25 Mar 2015 00:22:16 +0000 (00:22 +0000)]
Hand-apply ec3e6abf817b84d589f0782b01f5059dd3bf0953; only allow even
DCP audio channel counts between 2 and 16 inclusive.

9 years agoMissing files.
Carl Hetherington [Wed, 25 Mar 2015 00:15:23 +0000 (00:15 +0000)]
Missing files.

9 years agoHand-apply 3e3d3e46a74af7b3e6431033c7c80bd058c02cf6update; full/play
Carl Hetherington [Wed, 25 Mar 2015 00:14:10 +0000 (00:14 +0000)]
Hand-apply 3e3d3e46a74af7b3e6431033c7c80bd058c02cf6update; full/play
length in the timing panel when the DCP frame rate is changed.

9 years agoMissed trim of TO_PORT from previous.
Carl Hetherington [Wed, 25 Mar 2015 00:01:01 +0000 (00:01 +0000)]
Missed trim of TO_PORT from previous.

9 years agoHand-apply c7ce6fcf9bc6b5b1f6d823b7df256f43fefd660c; add a note to the
Carl Hetherington [Wed, 25 Mar 2015 00:00:06 +0000 (00:00 +0000)]
Hand-apply c7ce6fcf9bc6b5b1f6d823b7df256f43fefd660c; add a note to the
timing panel to try to stop people changing the video frame rate in
the wrong circumstances.

9 years agoHand-apply e30fd8d; resurrect JSON server code.
Carl Hetherington [Tue, 24 Mar 2015 23:57:22 +0000 (23:57 +0000)]
Hand-apply e30fd8d; resurrect JSON server code.

9 years agoHand-apply a2f81da6d9afc5d3b5e647e1e05ca5d4507af42c from master;
Carl Hetherington [Tue, 24 Mar 2015 23:30:08 +0000 (23:30 +0000)]
Hand-apply a2f81da6d9afc5d3b5e647e1e05ca5d4507af42c from master;
allow "deletion" of the audio part of a FFmpeg file from the
timeline; delete unmaps the audio (#316).

9 years agoTO_PORT already applied.
Carl Hetherington [Tue, 24 Mar 2015 22:52:02 +0000 (22:52 +0000)]
TO_PORT already applied.

9 years agoTO_PORT.
Carl Hetherington [Sat, 21 Mar 2015 12:14:48 +0000 (12:14 +0000)]
TO_PORT.

9 years agoHand-apply 33b76b675d747fd828aba91d9d857227cb8a8244 from master; make sure signals...
Carl Hetherington [Mon, 16 Mar 2015 22:25:57 +0000 (22:25 +0000)]
Hand-apply 33b76b675d747fd828aba91d9d857227cb8a8244 from master; make sure signals are disconnected in the right places.

9 years agoUpdate TO_PORT.
Carl Hetherington [Mon, 16 Mar 2015 20:40:51 +0000 (20:40 +0000)]
Update TO_PORT.

9 years agoTO_PORT.
Carl Hetherington [Sat, 7 Mar 2015 15:36:46 +0000 (15:36 +0000)]
TO_PORT.

9 years agoMerge.
Carl Hetherington [Fri, 6 Mar 2015 17:14:50 +0000 (17:14 +0000)]
Merge.

9 years agoTO_PORT.
Carl Hetherington [Fri, 6 Mar 2015 17:14:33 +0000 (17:14 +0000)]
TO_PORT.

9 years agoTO_PORT
Carl Hetherington [Wed, 4 Mar 2015 10:00:37 +0000 (10:00 +0000)]
TO_PORT

9 years agoTO_PORT.
Carl Hetherington [Fri, 27 Feb 2015 15:37:25 +0000 (15:37 +0000)]
TO_PORT.

9 years agoBump version
Carl Hetherington [Wed, 25 Feb 2015 00:14:39 +0000 (00:14 +0000)]
Bump version

9 years agoBump version
Carl Hetherington [Wed, 25 Feb 2015 00:14:39 +0000 (00:14 +0000)]
Bump version

9 years agoForward-port 86a5cdbe6ddb3506515cf8585a0902937147862e from master; crash when repeati...
Carl Hetherington [Tue, 24 Feb 2015 22:58:38 +0000 (22:58 +0000)]
Forward-port 86a5cdbe6ddb3506515cf8585a0902937147862e from master; crash when repeating MagickImage frames.

9 years agoTO_PORT.
Carl Hetherington [Sun, 22 Feb 2015 18:37:20 +0000 (18:37 +0000)]
TO_PORT.

9 years agoRemove debug code.
Carl Hetherington [Thu, 19 Feb 2015 16:33:48 +0000 (16:33 +0000)]
Remove debug code.

9 years agoUpdate copyright year.
Carl Hetherington [Thu, 19 Feb 2015 16:33:30 +0000 (16:33 +0000)]
Update copyright year.

9 years agoMerge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Thu, 19 Feb 2015 00:17:37 +0000 (00:17 +0000)]
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

9 years agoSplit up Timeline view classes.
Carl Hetherington [Thu, 19 Feb 2015 00:17:34 +0000 (00:17 +0000)]
Split up Timeline view classes.

9 years agoFix build.
Carl Hetherington [Wed, 18 Feb 2015 09:18:37 +0000 (09:18 +0000)]
Fix build.

9 years agoIncorrect include path.
Carl Hetherington [Tue, 17 Feb 2015 23:56:45 +0000 (23:56 +0000)]
Incorrect include path.

9 years agoHand-apply 71a4c0f5440688a38a2bb34170a3ccf9b1ea598f from 1.x;
Carl Hetherington [Tue, 17 Feb 2015 23:43:23 +0000 (23:43 +0000)]
Hand-apply 71a4c0f5440688a38a2bb34170a3ccf9b1ea598f from 1.x;
correctly sort image sequences.

9 years agoApply the remainder of a 1.x patch; a test.
Carl Hetherington [Tue, 17 Feb 2015 23:41:04 +0000 (23:41 +0000)]
Apply the remainder of a 1.x patch; a test.

9 years agoFix crash on loading J2K files.
Carl Hetherington [Tue, 17 Feb 2015 23:37:23 +0000 (23:37 +0000)]
Fix crash on loading J2K files.

9 years agoSupporter.
Carl Hetherington [Tue, 17 Feb 2015 09:16:46 +0000 (09:16 +0000)]
Supporter.

9 years agoMerge.
Carl Hetherington [Mon, 16 Feb 2015 22:02:55 +0000 (22:02 +0000)]
Merge.

9 years agoTO_PORT.
Carl Hetherington [Mon, 16 Feb 2015 22:02:35 +0000 (22:02 +0000)]
TO_PORT.