Carl Hetherington [Mon, 22 Dec 2014 01:05:52 +0000 (01:05 +0000)]
More libsub tweaks.
Carl Hetherington [Mon, 22 Dec 2014 00:28:22 +0000 (00:28 +0000)]
More libsub pkg-config fixes.
Carl Hetherington [Mon, 22 Dec 2014 00:22:26 +0000 (00:22 +0000)]
Fix libsub pkg-config filename.
Carl Hetherington [Sun, 21 Dec 2014 03:05:06 +0000 (03:05 +0000)]
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Carl Hetherington [Sun, 21 Dec 2014 03:05:02 +0000 (03:05 +0000)]
We need libsub1.
Carl Hetherington [Sun, 21 Dec 2014 02:20:48 +0000 (02:20 +0000)]
Fix build.
Carl Hetherington [Sun, 21 Dec 2014 02:14:48 +0000 (02:14 +0000)]
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Sun, 21 Dec 2014 02:14:37 +0000 (02:14 +0000)]
Don't create subtitle content if there is an empty fonts list.
Carl Hetherington [Sun, 21 Dec 2014 02:01:22 +0000 (02:01 +0000)]
Revert most of vertical positioning stuff from previous commit.
Carl Hetherington [Sun, 21 Dec 2014 01:50:07 +0000 (01:50 +0000)]
Update xml_subtitle_test result now that subtitles are being compared; improve placement in SubRip decoder.
Carl Hetherington [Sun, 21 Dec 2014 00:32:37 +0000 (00:32 +0000)]
Fix typos on hand-applying patch.
Carl Hetherington [Sat, 20 Dec 2014 23:55:23 +0000 (23:55 +0000)]
Missing file.
Carl Hetherington [Sat, 20 Dec 2014 23:39:13 +0000 (23:39 +0000)]
Missing include.
Carl Hetherington [Sat, 20 Dec 2014 23:37:57 +0000 (23:37 +0000)]
Hand-apply
d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert()s with thrown exceptions.
Carl Hetherington [Sat, 20 Dec 2014 22:49:43 +0000 (22:49 +0000)]
Carl Hetherington [Sat, 20 Dec 2014 22:48:54 +0000 (22:48 +0000)]
Carl Hetherington [Sat, 20 Dec 2014 22:29:59 +0000 (22:29 +0000)]
Missing files.
Carl Hetherington [Sat, 20 Dec 2014 22:29:21 +0000 (22:29 +0000)]
Basic pass-through of font information when using DCP subtitles.
Carl Hetherington [Thu, 18 Dec 2014 17:22:56 +0000 (17:22 +0000)]
Forward-port fixes to Show DCP from master.
Carl Hetherington [Wed, 17 Dec 2014 14:25:26 +0000 (14:25 +0000)]
Disable copy-as-name button with no Film.
Carl Hetherington [Tue, 16 Dec 2014 12:38:58 +0000 (12:38 +0000)]
Allow setting of font files.
Carl Hetherington [Tue, 16 Dec 2014 11:16:48 +0000 (11:16 +0000)]
Save and load subtitle font details.
Carl Hetherington [Mon, 15 Dec 2014 16:56:18 +0000 (16:56 +0000)]
Start of Fonts dialog for setting up subtitle fonts.
Carl Hetherington [Mon, 15 Dec 2014 15:15:37 +0000 (15:15 +0000)]
Typo.
Carl Hetherington [Mon, 15 Dec 2014 14:22:40 +0000 (14:22 +0000)]
More fixes for newer libdcp.
Carl Hetherington [Mon, 15 Dec 2014 13:59:15 +0000 (13:59 +0000)]
Modify for new libdcp API.
Carl Hetherington [Mon, 15 Dec 2014 11:14:37 +0000 (11:14 +0000)]
Hand-apply
96593d0ea6eb7b01ee97c8292c4546fc56d3da9d; only write metadata before encode in the main front-end, not the cli/batch processors.
Carl Hetherington [Mon, 15 Dec 2014 11:13:15 +0000 (11:13 +0000)]
Catch exceptions when getting video for the view.
Carl Hetherington [Mon, 15 Dec 2014 11:09:59 +0000 (11:09 +0000)]
Carl Hetherington [Mon, 15 Dec 2014 11:08:58 +0000 (11:08 +0000)]
Hand-apply
e9b7f3df544697d6af9d926d32405a797841960a; add 'copy to name' button to allow editing of ISDCF names after creation rather than the 'replace on disable' hack.
Carl Hetherington [Mon, 15 Dec 2014 11:04:45 +0000 (11:04 +0000)]
Hand-apply
9e173bdda26f32a1da7afc38d5dcf8ed63e7d3cf; fix a few missing checks on the return value of ShowModal (#449).
Carl Hetherington [Mon, 15 Dec 2014 11:01:40 +0000 (11:01 +0000)]
Hand-apply
d1bffe67820adaa10654f722b15eebdd773b3680; remove unnecessary JobWrapper stuff.
Carl Hetherington [Mon, 15 Dec 2014 10:58:01 +0000 (10:58 +0000)]
Hand-apply
155b4b9f615f42b5cc26e2953860aba34b17bbc0; allow build of Windows debug version using gdb.
Carl Hetherington [Mon, 15 Dec 2014 10:33:09 +0000 (10:33 +0000)]
Fix previous.
Carl Hetherington [Mon, 15 Dec 2014 10:31:48 +0000 (10:31 +0000)]
Hand-apply
75be314ee89fb2f4e783b4079f7fabf69e79d636 from master; fix hidden content appearing (#418).
Carl Hetherington [Mon, 15 Dec 2014 10:31:13 +0000 (10:31 +0000)]
Add TO_PORT.
Carl Hetherington [Mon, 15 Dec 2014 09:48:14 +0000 (09:48 +0000)]
Merge.
Carl Hetherington [Mon, 15 Dec 2014 09:47:55 +0000 (09:47 +0000)]
More stuff to port.
Carl Hetherington [Sun, 14 Dec 2014 23:56:27 +0000 (23:56 +0000)]
to port.
Carl Hetherington [Sun, 14 Dec 2014 17:09:06 +0000 (17:09 +0000)]
Bump version
Carl Hetherington [Sun, 14 Dec 2014 17:09:06 +0000 (17:09 +0000)]
Bump version
Carl Hetherington [Sun, 14 Dec 2014 16:28:19 +0000 (16:28 +0000)]
Missing OS X dependency.
Carl Hetherington [Sun, 14 Dec 2014 01:08:33 +0000 (01:08 +0000)]
to-port.
Carl Hetherington [Fri, 12 Dec 2014 09:13:17 +0000 (09:13 +0000)]
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Fri, 12 Dec 2014 09:13:04 +0000 (09:13 +0000)]
Add things to port.
Carl Hetherington [Thu, 11 Dec 2014 22:57:23 +0000 (22:57 +0000)]
Bump version
Carl Hetherington [Thu, 11 Dec 2014 22:57:23 +0000 (22:57 +0000)]
Bump version
Carl Hetherington [Thu, 11 Dec 2014 20:02:14 +0000 (20:02 +0000)]
OS X build fix.
Carl Hetherington [Thu, 11 Dec 2014 16:53:12 +0000 (16:53 +0000)]
Bump version
Carl Hetherington [Thu, 11 Dec 2014 16:53:12 +0000 (16:53 +0000)]
Bump version
Carl Hetherington [Thu, 11 Dec 2014 16:52:14 +0000 (16:52 +0000)]
Fix another cocked up merge.
Carl Hetherington [Thu, 11 Dec 2014 16:47:48 +0000 (16:47 +0000)]
Merge.
Carl Hetherington [Thu, 11 Dec 2014 15:20:33 +0000 (15:20 +0000)]
Add language property to SubtitleContent and use it in output DCP subtitle files.
Carl Hetherington [Thu, 11 Dec 2014 15:20:33 +0000 (15:20 +0000)]
Initial UI / backend storage.
Carl Hetherington [Wed, 10 Dec 2014 00:56:48 +0000 (00:56 +0000)]
Trim unused stuff.
Carl Hetherington [Tue, 9 Dec 2014 23:58:07 +0000 (23:58 +0000)]
Disable tests which depend on variable font rendering.
Carl Hetherington [Tue, 9 Dec 2014 23:00:37 +0000 (23:00 +0000)]
Fix test.
Carl Hetherington [Tue, 9 Dec 2014 22:18:48 +0000 (22:18 +0000)]
Fix fill_2d not doing what it is specified to do.
Carl Hetherington [Tue, 9 Dec 2014 20:56:42 +0000 (20:56 +0000)]
Forward-port DCA footer fix from master.
Carl Hetherington [Tue, 9 Dec 2014 20:48:23 +0000 (20:48 +0000)]
Tweak test check.
Carl Hetherington [Tue, 9 Dec 2014 16:30:31 +0000 (16:30 +0000)]
Various fixes pointed out by tests.
Carl Hetherington [Tue, 9 Dec 2014 11:10:34 +0000 (11:10 +0000)]
Update TO_PORT.
Carl Hetherington [Tue, 9 Dec 2014 11:10:00 +0000 (11:10 +0000)]
Hand-apply
22c79dac4ae2b01b448cc5886f8e8ff3a0cfb69b from master; fix broken still image support.
Carl Hetherington [Tue, 9 Dec 2014 11:06:47 +0000 (11:06 +0000)]
Include trimming.
Carl Hetherington [Tue, 9 Dec 2014 11:00:32 +0000 (11:00 +0000)]
Update TO_PORT.
Carl Hetherington [Tue, 9 Dec 2014 11:00:22 +0000 (11:00 +0000)]
Hand apply
5e96dbee6de3b4baf82083e5c7169f27e6051c5b from master; give a nicer error when writing config fails.
Carl Hetherington [Mon, 8 Dec 2014 13:21:21 +0000 (13:21 +0000)]
Hand-apply
63142d58947cf10ed6f6eaeb42508eaa374a6a93 from master; fix calls to new digest() call.
Carl Hetherington [Mon, 8 Dec 2014 13:18:34 +0000 (13:18 +0000)]
Hand apply
73fb7a2a537ea736c5ea8305061e64e129b4878b from master; lose connection to Film when destroying TimelineDialog.
Carl Hetherington [Mon, 8 Dec 2014 13:17:11 +0000 (13:17 +0000)]
Hand-apply
306fd00490daf4f447db1f25811a9c61ad76274a from master; increase maximum allowed JPEG2000 bandwidth.
Carl Hetherington [Sat, 6 Dec 2014 22:59:40 +0000 (22:59 +0000)]
More include fixes.
Carl Hetherington [Sat, 6 Dec 2014 20:24:26 +0000 (20:24 +0000)]
Missing include and hide a warning on Windows.
Carl Hetherington [Sat, 6 Dec 2014 20:22:09 +0000 (20:22 +0000)]
Unnecessary using.
Carl Hetherington [Fri, 5 Dec 2014 15:45:05 +0000 (15:45 +0000)]
More header file rearrangement.
Carl Hetherington [Fri, 5 Dec 2014 15:35:44 +0000 (15:35 +0000)]
Include rearrangement.
Carl Hetherington [Fri, 5 Dec 2014 15:10:49 +0000 (15:10 +0000)]
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Carl Hetherington [Fri, 5 Dec 2014 15:10:42 +0000 (15:10 +0000)]
Some include tidying.
Carl Hetherington [Fri, 5 Dec 2014 15:05:50 +0000 (15:05 +0000)]
to-port.
Carl Hetherington [Thu, 4 Dec 2014 13:18:12 +0000 (13:18 +0000)]
Merge.
Carl Hetherington [Thu, 4 Dec 2014 13:17:55 +0000 (13:17 +0000)]
Add TO_PORT.
Carl Hetherington [Wed, 3 Dec 2014 22:56:43 +0000 (22:56 +0000)]
Add to-port.
Carl Hetherington [Wed, 3 Dec 2014 16:58:46 +0000 (16:58 +0000)]
Fix TO_PORT.
Carl Hetherington [Wed, 3 Dec 2014 16:58:36 +0000 (16:58 +0000)]
Add port.
Carl Hetherington [Wed, 3 Dec 2014 11:24:47 +0000 (11:24 +0000)]
Fix build.
Carl Hetherington [Wed, 3 Dec 2014 10:37:15 +0000 (10:37 +0000)]
Hand-apply
d3bc61f0af33fedf02ac1a28cf91989ee9cd2fb6 from master;
make digest optional.
Carl Hetherington [Wed, 3 Dec 2014 10:12:35 +0000 (10:12 +0000)]
Hand-apply
6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;
Basics of an image sequence dialog that asks about frame rate and
digest calculation.
Carl Hetherington [Wed, 3 Dec 2014 09:33:34 +0000 (09:33 +0000)]
Hand-apply
0ca0ab9f23ac0238643a6d148148385388f71c00 from master;
potential use-after-free.
Carl Hetherington [Wed, 3 Dec 2014 09:32:32 +0000 (09:32 +0000)]
Carl Hetherington [Wed, 3 Dec 2014 09:31:35 +0000 (09:31 +0000)]
Carl Hetherington [Wed, 3 Dec 2014 09:27:53 +0000 (09:27 +0000)]
Hand-apply
63b62aa703c2628b27b577114081b265f237dadb from master;
fix missing parameter in log entry.
Carl Hetherington [Wed, 3 Dec 2014 09:26:41 +0000 (09:26 +0000)]
Update TO_PORT.
Carl Hetherington [Wed, 3 Dec 2014 09:24:54 +0000 (09:24 +0000)]
Update TO_PORT.
Carl Hetherington [Wed, 3 Dec 2014 09:24:12 +0000 (09:24 +0000)]
Make pot, pot merge.
Carl Hetherington [Wed, 3 Dec 2014 00:49:52 +0000 (00:49 +0000)]
Update TO_PORT.
Carl Hetherington [Wed, 3 Dec 2014 00:49:37 +0000 (00:49 +0000)]
Hand apply
e4615ebe1cef519e3aaee317ca6d319fbb9a0903 from master; put job errors in the logs.
Carl Hetherington [Tue, 2 Dec 2014 23:45:57 +0000 (23:45 +0000)]
Update TO_PORT.
Carl Hetherington [Tue, 2 Dec 2014 23:45:43 +0000 (23:45 +0000)]
Hand apply
3e776856db5f722437ff0b841120400ee6f43e14 from master; better error on av_buffersrc_write_frame failure.
Carl Hetherington [Tue, 2 Dec 2014 23:44:41 +0000 (23:44 +0000)]
One commit has already been ported.
Carl Hetherington [Tue, 2 Dec 2014 23:43:51 +0000 (23:43 +0000)]
Hand-apply
99a832a19ccbead25d36e50545d6fd2c46454113 from master; add comment for translators.
Carl Hetherington [Tue, 2 Dec 2014 23:40:50 +0000 (23:40 +0000)]
More stuff to port.
Carl Hetherington [Tue, 2 Dec 2014 21:48:46 +0000 (21:48 +0000)]
More stuff to port.