dcpomatic.git
3 years agoBump ffmpeg to carl-dcpomatic-12 (4.2.2).
Carl Hetherington [Wed, 6 May 2020 22:06:44 +0000 (00:06 +0200)]
Bump ffmpeg to carl-dcpomatic-12 (4.2.2).

3 years agoAdd a new "Add DKDM" dialogue (#1637).
Carl Hetherington [Wed, 6 May 2020 22:02:26 +0000 (00:02 +0200)]
Add a new "Add DKDM" dialogue (#1637).

The basic motivation here is to avoid having to tell people to
"just" create a cinema with a screen in it just to be able to make
a DKDM.  Here you can just have a recipient, with emails etc.
and make DKDMs for them.  I hope this makes things clearer from the
user POV even if it does muddy the waters a bit with respect to
DKDMs just being KDMs (really).

3 years agoAdd a 'Make DKDM' dialogue box to simplify and (hopefully) clarify DKDM creation...
Carl Hetherington [Wed, 6 May 2020 22:00:40 +0000 (00:00 +0200)]
Add a 'Make DKDM' dialogue box to simplify and (hopefully) clarify DKDM creation (#1637).

3 years agoMissing header guard.
Carl Hetherington [Wed, 6 May 2020 21:58:51 +0000 (23:58 +0200)]
Missing header guard.

3 years agoAdd configuration options for DKDMs.
Carl Hetherington [Wed, 6 May 2020 21:58:36 +0000 (23:58 +0200)]
Add configuration options for DKDMs.

3 years agoDerive Screen from a new class KDMRecipient.
Carl Hetherington [Wed, 29 Apr 2020 23:06:13 +0000 (01:06 +0200)]
Derive Screen from a new class KDMRecipient.

3 years agoMove TrustedDevice to its own source files.
Carl Hetherington [Wed, 29 Apr 2020 22:28:33 +0000 (00:28 +0200)]
Move TrustedDevice to its own source files.

3 years agoIgnore screen specifier when making containers.
Carl Hetherington [Wed, 6 May 2020 18:14:46 +0000 (20:14 +0200)]
Ignore screen specifier when making containers.

3 years agoAdd some unit tests.
Carl Hetherington [Tue, 5 May 2020 20:28:35 +0000 (22:28 +0200)]
Add some unit tests.

3 years agoExtract common code out into kdm_for_screen()
Carl Hetherington [Tue, 5 May 2020 20:28:25 +0000 (22:28 +0200)]
Extract common code out into kdm_for_screen()

3 years agoconst correctness.
Carl Hetherington [Tue, 5 May 2020 20:27:54 +0000 (22:27 +0200)]
const correctness.

3 years agoRemove some now-pointless passing of name_values.
Carl Hetherington [Tue, 5 May 2020 18:03:55 +0000 (20:03 +0200)]
Remove some now-pointless passing of name_values.

3 years agoUse a template to clean things up a little.
Carl Hetherington [Tue, 5 May 2020 13:30:15 +0000 (15:30 +0200)]
Use a template to clean things up a little.

3 years agoSet 'i' earlier in name_values.
Carl Hetherington [Tue, 5 May 2020 13:24:36 +0000 (15:24 +0200)]
Set 'i' earlier in name_values.

3 years agoWrite 'f', 'b' and 'e' tags into all KDMWithMetadata when they are made.
Carl Hetherington [Tue, 5 May 2020 13:08:50 +0000 (15:08 +0200)]
Write 'f', 'b' and 'e' tags into all KDMWithMetadata when they are made.

3 years agoRename some variables and re-implement collect().
Carl Hetherington [Tue, 5 May 2020 12:16:36 +0000 (14:16 +0200)]
Rename some variables and re-implement collect().

3 years agoMove some functions to kdm_with_metadata
Carl Hetherington [Mon, 4 May 2020 22:56:54 +0000 (00:56 +0200)]
Move some functions to kdm_with_metadata

3 years agoReplace CinemaKDMs class with a list<KDMWithMetadata>
Carl Hetherington [Mon, 4 May 2020 22:35:13 +0000 (00:35 +0200)]
Replace CinemaKDMs class with a list<KDMWithMetadata>

3 years agoPull methods out of CinemaKDMs.
Carl Hetherington [Mon, 4 May 2020 21:37:22 +0000 (23:37 +0200)]
Pull methods out of CinemaKDMs.

3 years agoRemove Screen pointer from KDMWithMetadata, preferring to
Carl Hetherington [Mon, 4 May 2020 21:30:23 +0000 (23:30 +0200)]
Remove Screen pointer from KDMWithMetadata, preferring to
add metadata to a dcp::NameFormat::Map earlier in the
call stack.

3 years agoAdd KDMWithMetadataPtr typedef
Carl Hetherington [Mon, 4 May 2020 21:02:45 +0000 (23:02 +0200)]
Add KDMWithMetadataPtr typedef

3 years agoRename ScreenKDM -> KDMWithMetadata
Carl Hetherington [Mon, 4 May 2020 20:53:08 +0000 (22:53 +0200)]
Rename ScreenKDM -> KDMWithMetadata

3 years agoMove Film::make_kdms to the call sites.
Carl Hetherington [Fri, 1 May 2020 20:53:01 +0000 (22:53 +0200)]
Move Film::make_kdms to the call sites.

3 years agoMissing library from test link list.
Carl Hetherington [Mon, 4 May 2020 12:51:18 +0000 (14:51 +0200)]
Missing library from test link list.

3 years agoAdd Zipper class and use it in CinemaKDMs.
Carl Hetherington [Sun, 3 May 2020 20:28:09 +0000 (22:28 +0200)]
Add Zipper class and use it in CinemaKDMs.

3 years agopot/merge. v2.15.71
Carl Hetherington [Sat, 2 May 2020 23:19:45 +0000 (01:19 +0200)]
pot/merge.

3 years agoFormatting tweaks to unmount dialogue.
Carl Hetherington [Sat, 2 May 2020 23:16:36 +0000 (01:16 +0200)]
Formatting tweaks to unmount dialogue.

3 years agoFix unmount of drives with spaces in their names (#1744).
Carl Hetherington [Sat, 2 May 2020 23:13:26 +0000 (01:13 +0200)]
Fix unmount of drives with spaces in their names (#1744).

3 years agoRemove some debug code.
Carl Hetherington [Sat, 2 May 2020 23:13:01 +0000 (01:13 +0200)]
Remove some debug code.

3 years agoFix behaviour on disk writer window close.
Carl Hetherington [Sat, 2 May 2020 22:51:17 +0000 (00:51 +0200)]
Fix behaviour on disk writer window close.

3 years agoDo all writes then do all verification and report progress
Carl Hetherington [Sat, 2 May 2020 22:41:24 +0000 (00:41 +0200)]
Do all writes then do all verification and report progress
for each separately (#1743)

3 years agoTry to start _writer on-demand on macOS (#1739).
Carl Hetherington [Sat, 2 May 2020 19:37:14 +0000 (21:37 +0200)]
Try to start _writer on-demand on macOS (#1739).

3 years agoTry unloading the old disk writer on install (may fix #1738).
Carl Hetherington [Sat, 2 May 2020 17:59:27 +0000 (19:59 +0200)]
Try unloading the old disk writer on install (may fix #1738).

3 years agoBump lwext. v2.15.70
Carl Hetherington [Sat, 2 May 2020 00:51:40 +0000 (02:51 +0200)]
Bump lwext.

3 years agoAdd a specific lwext4 commit to the cscript. v2.15.69
Carl Hetherington [Fri, 1 May 2020 23:58:57 +0000 (01:58 +0200)]
Add a specific lwext4 commit to the cscript.

3 years agoAdd git commits to writer log files. v2.15.68
Carl Hetherington [Thu, 30 Apr 2020 18:07:46 +0000 (20:07 +0200)]
Add git commits to writer log files.

3 years agoTurn on lwext4 debugging to see if that helps.
Carl Hetherington [Thu, 30 Apr 2020 14:59:49 +0000 (16:59 +0200)]
Turn on lwext4 debugging to see if that helps.

3 years agoAdd some more macOS debug logging for disks, and ignore mounted disk images.
Carl Hetherington [Thu, 30 Apr 2020 14:55:46 +0000 (16:55 +0200)]
Add some more macOS debug logging for disks, and ignore mounted disk images.

3 years agoMissed part of rdisk -> disk revert. v2.15.67
Carl Hetherington [Wed, 29 Apr 2020 23:25:52 +0000 (01:25 +0200)]
Missed part of rdisk -> disk revert.

3 years agoCorrect ext2 block size to 4096.
Carl Hetherington [Wed, 29 Apr 2020 23:23:51 +0000 (01:23 +0200)]
Correct ext2 block size to 4096.

It seems that this is the typical Linux value; it allows large files
and so on.  But more importantly, it appears that this change turns
the lwext4 library code from taking an hour+ to do a USB stick format on mac
(and maybe other platforms) to taking under 3 minutes.

The underlying reason for this is not clear.

3 years agoRevert mac rdisk vs disk stuff as I'm not convinced it makes much difference.
Carl Hetherington [Wed, 29 Apr 2020 23:16:20 +0000 (01:16 +0200)]
Revert mac rdisk vs disk stuff as I'm not convinced it makes much difference.

3 years agoAdd exit command to stress tester.
Carl Hetherington [Wed, 29 Apr 2020 20:45:54 +0000 (22:45 +0200)]
Add exit command to stress tester.

3 years agoPut current frame position in seek-by-frame dialogue when opening it (#1736).
Carl Hetherington [Wed, 29 Apr 2020 20:14:15 +0000 (22:14 +0200)]
Put current frame position in seek-by-frame dialogue when opening it (#1736).

3 years agoAdd hinting to the seek dialogue; may be a nice fix for #1736.
Carl Hetherington [Wed, 29 Apr 2020 20:03:37 +0000 (22:03 +0200)]
Add hinting to the seek dialogue; may be a nice fix for #1736.

3 years agoUse raw_convert rather than lexical_cast.
Carl Hetherington [Wed, 29 Apr 2020 19:49:17 +0000 (21:49 +0200)]
Use raw_convert rather than lexical_cast.

3 years agoFurther sanity check fixes. v2.15.66
Carl Hetherington [Tue, 28 Apr 2020 12:17:30 +0000 (14:17 +0200)]
Further sanity check fixes.

3 years agoFix macOS sanity check.
Carl Hetherington [Tue, 28 Apr 2020 12:05:20 +0000 (14:05 +0200)]
Fix macOS sanity check.

3 years agoAdd a log message and actually use device_for_write().
Carl Hetherington [Tue, 28 Apr 2020 11:46:46 +0000 (13:46 +0200)]
Add a log message and actually use device_for_write().

3 years agoAdd a log message.
Carl Hetherington [Tue, 28 Apr 2020 11:46:36 +0000 (13:46 +0200)]
Add a log message.

3 years agoFix warning.
Carl Hetherington [Tue, 28 Apr 2020 11:46:07 +0000 (13:46 +0200)]
Fix warning.

3 years agoRemove some unnecessary methods. v2.15.65
Carl Hetherington [Tue, 28 Apr 2020 00:14:38 +0000 (02:14 +0200)]
Remove some unnecessary methods.

3 years agoFix build.
Carl Hetherington [Tue, 28 Apr 2020 00:05:17 +0000 (02:05 +0200)]
Fix build.

3 years agoMissing files. v2.15.64
Carl Hetherington [Mon, 27 Apr 2020 23:34:29 +0000 (01:34 +0200)]
Missing files.

3 years agoWriter on macOS runs as root, so trying to use the config_path() v2.15.63
Carl Hetherington [Mon, 27 Apr 2020 21:51:03 +0000 (23:51 +0200)]
Writer on macOS runs as root, so trying to use the config_path()
to log to will end up trying to write to root's home.  Instead,
log to stdout as the process control stuff redirects that into
/var/log anyway.

3 years agoExperimental use of /dev/rdisk rather than /dev/disk on macOS,
Carl Hetherington [Mon, 27 Apr 2020 21:44:06 +0000 (23:44 +0200)]
Experimental use of /dev/rdisk rather than /dev/disk on macOS,
as there is some suggestion it is faster.

3 years agoAdd Sebastian Leitner as a tester.
Carl Hetherington [Mon, 27 Apr 2020 20:58:03 +0000 (22:58 +0200)]
Add Sebastian Leitner as a tester.

3 years agoUse F_SET_EXT2 not EXT4.
Carl Hetherington [Mon, 27 Apr 2020 20:52:45 +0000 (22:52 +0200)]
Use F_SET_EXT2 not EXT4.

3 years agoThe Disk Writer also needs openssl as creating its Config object v2.15.62
Carl Hetherington [Mon, 27 Apr 2020 13:10:10 +0000 (15:10 +0200)]
The Disk Writer also needs openssl as creating its Config object
will try to make certificates if it's the first DCP-o-matic tool
to be run on a machine.  In theory we could make the cert creation
not happen for the disk writer but that seems a little fiddly.

3 years agoFix disk writer stdout/stderr paths.
Carl Hetherington [Mon, 27 Apr 2020 13:00:52 +0000 (15:00 +0200)]
Fix disk writer stdout/stderr paths.

3 years agoMissing icons for _disk.
Carl Hetherington [Sun, 26 Apr 2020 23:26:56 +0000 (01:26 +0200)]
Missing icons for _disk.

3 years agoMissed disk writer from appimage.
Carl Hetherington [Sun, 26 Apr 2020 23:19:42 +0000 (01:19 +0200)]
Missed disk writer from appimage.

3 years agoMore Debian 8 trimming. v2.15.61
Carl Hetherington [Sun, 26 Apr 2020 19:34:40 +0000 (21:34 +0200)]
More Debian 8 trimming.

3 years agoDebian 8 will be EOL before DCP-o-matic 2.16.0.
Carl Hetherington [Sun, 26 Apr 2020 19:34:09 +0000 (21:34 +0200)]
Debian 8 will be EOL before DCP-o-matic 2.16.0.

3 years agoDebian 9 uses an older libxerces.
Carl Hetherington [Sun, 26 Apr 2020 19:33:02 +0000 (21:33 +0200)]
Debian 9 uses an older libxerces.

3 years agoSome basic notes on smoke testing.
Carl Hetherington [Sun, 26 Apr 2020 19:23:32 +0000 (21:23 +0200)]
Some basic notes on smoke testing.

3 years agoUbuntu 19.10 also has libnanomsg5.
Carl Hetherington [Sun, 26 Apr 2020 19:11:24 +0000 (21:11 +0200)]
Ubuntu 19.10 also has libnanomsg5.

3 years agoAdd disk desktop icon to spec.
Carl Hetherington [Sun, 26 Apr 2020 18:31:07 +0000 (20:31 +0200)]
Add disk desktop icon to spec.

3 years agoAdd missing creation of .desktop file for disk tool.
Carl Hetherington [Sun, 26 Apr 2020 18:29:28 +0000 (20:29 +0200)]
Add missing creation of .desktop file for disk tool.

3 years agoFix ubuntu 20.04 nanomsg version.
Carl Hetherington [Sun, 26 Apr 2020 17:47:45 +0000 (19:47 +0200)]
Fix ubuntu 20.04 nanomsg version.

3 years agoFix previous on Windows/macOS. v2.15.60
Carl Hetherington [Sat, 25 Apr 2020 22:42:01 +0000 (00:42 +0200)]
Fix previous on Windows/macOS.

3 years agoAdd link with anl to fix Centos 8 build. v2.15.59
Carl Hetherington [Sat, 25 Apr 2020 18:31:27 +0000 (20:31 +0200)]
Add link with anl to fix Centos 8 build.

3 years agoCan't build disk on Ubuntu 16.04 as boost is too old.
Carl Hetherington [Sat, 25 Apr 2020 18:27:56 +0000 (20:27 +0200)]
Can't build disk on Ubuntu 16.04 as boost is too old.

3 years agoWe build the disk stuff for AppImage (which uses 16.04) so we might as well build...
Carl Hetherington [Sat, 25 Apr 2020 10:29:02 +0000 (12:29 +0200)]
We build the disk stuff for AppImage (which uses 16.04) so we might as well build for 16.04 as well.

3 years agoFix xerces version for Ubuntu 16. v2.15.58
Carl Hetherington [Fri, 24 Apr 2020 21:02:14 +0000 (23:02 +0200)]
Fix xerces version for Ubuntu 16.

3 years agoMissing dependencies.
Carl Hetherington [Fri, 24 Apr 2020 19:53:15 +0000 (21:53 +0200)]
Missing dependencies.

3 years agoExpand can_build_disk a bit.
Carl Hetherington [Fri, 24 Apr 2020 19:47:23 +0000 (21:47 +0200)]
Expand can_build_disk a bit.

3 years agoMissing nanomsg dependencies.
Carl Hetherington [Fri, 24 Apr 2020 19:08:07 +0000 (21:08 +0200)]
Missing nanomsg dependencies.

3 years agoBuild disk on Ubuntu 19.10 and 20.04
Carl Hetherington [Fri, 24 Apr 2020 18:37:15 +0000 (20:37 +0200)]
Build disk on Ubuntu 19.10 and 20.04

3 years agoMissing dylib for macOS.
Carl Hetherington [Fri, 24 Apr 2020 18:17:39 +0000 (20:17 +0200)]
Missing dylib for macOS.

3 years agoFix typo and missing serialisation of offsets at time of analysis.
Carl Hetherington [Fri, 24 Apr 2020 15:46:01 +0000 (17:46 +0200)]
Fix typo and missing serialisation of offsets at time of analysis.

3 years agoAnother build fix (for non-Linux this time). v2.15.57
Carl Hetherington [Fri, 24 Apr 2020 14:46:36 +0000 (16:46 +0200)]
Another build fix (for non-Linux this time).

3 years agoFix some missing dependencies. v2.15.56
Carl Hetherington [Fri, 24 Apr 2020 14:20:58 +0000 (16:20 +0200)]
Fix some missing dependencies.

3 years agoUbuntu 20.04 packaging.
Carl Hetherington [Fri, 24 Apr 2020 11:31:51 +0000 (13:31 +0200)]
Ubuntu 20.04 packaging.

3 years agoMerge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
Carl Hetherington [Fri, 24 Apr 2020 14:18:37 +0000 (16:18 +0200)]
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

3 years agoFix build following previous commit.
Carl Hetherington [Fri, 24 Apr 2020 11:08:46 +0000 (13:08 +0200)]
Fix build following previous commit.

3 years agoMerge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x v2.15.55
Carl Hetherington [Thu, 23 Apr 2020 23:50:54 +0000 (01:50 +0200)]
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

3 years agoHopefully we can use GTK's file chooser button again now.
Carl Hetherington [Thu, 23 Apr 2020 23:33:58 +0000 (01:33 +0200)]
Hopefully we can use GTK's file chooser button again now.

3 years agoRemove disk-build optional stuff from macOS build.
Carl Hetherington [Thu, 23 Apr 2020 23:27:46 +0000 (01:27 +0200)]
Remove disk-build optional stuff from macOS build.

3 years agoAlway build with --enable-disk if we can, regardless of any cscript option. v2.15.54
Carl Hetherington [Thu, 23 Apr 2020 22:49:03 +0000 (00:49 +0200)]
Alway build with --enable-disk if we can, regardless of any cscript option.

3 years agoAdd subtitle analysis so that the outline of all subtitles
Carl Hetherington [Wed, 22 Apr 2020 22:11:38 +0000 (00:11 +0200)]
Add subtitle analysis so that the outline of all subtitles
in a piece of content can be overlaid onto the preview (#1233).

3 years agoSubstantial reworking of the font rendering code to measure
Carl Hetherington [Thu, 23 Apr 2020 21:10:46 +0000 (23:10 +0200)]
Substantial reworking of the font rendering code to measure
the size of the text before rendering, thereby creating correctly-
sized output images (rather than ones with guesses on height and
with the full target width).

This uses some potentially dubious behaviour described here
https://stackoverflow.com/questions/31788577/create-pango-layout-before-cairo-surface
and could cause any number of problems.

The advantages are that a) it should be a little more efficient and
b) the images created for the subtitle analysis code are useful.

3 years agoMore extractions.
Carl Hetherington [Thu, 23 Apr 2020 20:31:14 +0000 (22:31 +0200)]
More extractions.

3 years agoUse a variable for subtitles.front()
Carl Hetherington [Thu, 23 Apr 2020 20:24:05 +0000 (22:24 +0200)]
Use a variable for subtitles.front()

3 years agoExtract some bits of code into their own methods.
Carl Hetherington [Thu, 23 Apr 2020 19:38:48 +0000 (21:38 +0200)]
Extract some bits of code into their own methods.

3 years agoImprove layout of drive-wipe warning dialogue.
Carl Hetherington [Thu, 23 Apr 2020 22:46:13 +0000 (00:46 +0200)]
Improve layout of drive-wipe warning dialogue.

3 years agoAdd pre-running warning to disk writer.
Carl Hetherington [Thu, 23 Apr 2020 22:37:31 +0000 (00:37 +0200)]
Add pre-running warning to disk writer.

3 years agoMissing Windows DLL.
Carl Hetherington [Thu, 23 Apr 2020 21:59:06 +0000 (23:59 +0200)]
Missing Windows DLL.

3 years agoDon't clobber the current _player_video when the butler returns AGAIN. Fixes some...
Carl Hetherington [Thu, 23 Apr 2020 18:48:11 +0000 (20:48 +0200)]
Don't clobber the current _player_video when the butler returns AGAIN.  Fixes some seek-related glitches.

3 years agoNicer fix for 86102d30bf0aad89115bbeb3d8aaa2a27a0aa432
Carl Hetherington [Thu, 23 Apr 2020 13:48:19 +0000 (15:48 +0200)]
Nicer fix for 86102d30bf0aad89115bbeb3d8aaa2a27a0aa432

3 years agoAdd accessor for _playlist.
Carl Hetherington [Thu, 23 Apr 2020 13:00:56 +0000 (15:00 +0200)]
Add accessor for _playlist.