dcpomatic, branch v2.11.58 DCP-o-matic DCP tools https://git.carlh.net/cgit/dcpomatic/atom?h=v2.11.58 2018-02-18T01:31:39Z Bump version 2018-02-18T01:31:39Z Carl Hetherington cth@carlh.net 2018-02-18T01:31:39Z urn:sha1:f3577a24c4faeb34751eed6bc26022b4174b64a7 Hold lock for the whole of Butler::video(). Fixes jumpy nudge-seek 2018-02-18T01:26:03Z Carl Hetherington cth@carlh.net 2018-02-18T01:26:03Z urn:sha1:e941ab2b02cf01ab15427e47124b7dd32425095c when playing DCPs. Before, the lock was only held to check _pending_seek_position. With that arrangement, this sequence was possible: 1. video arrives, check _pending_seek_position, decide it's ok, release lock 2. Butler::seek called, sets _pending_seek_position, clears _video 3. video that arrived in #1 is put into _video by ::video() 4. that video is given to an awaiting get_video() call. This clearly subverts the attempts not to accept new video data while a seek is pending. Merge branch 'v2.12.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.12.x 2018-02-18T00:37:45Z Carl Hetherington cth@carlh.net 2018-02-18T00:37:45Z urn:sha1:59500421bda6e44bc6e92e27c6c21ea071eb81c1 Fix missing subtitles in the player when they are added with a VF. 2018-02-18T00:34:01Z Carl Hetherington cth@carlh.net 2018-02-18T00:34:01Z urn:sha1:3b83d4be7b9eadb6631cb98e289635154f84ad25 Set up seek position correctly when a seek skips over a reel in 2018-02-18T00:33:26Z Carl Hetherington cth@carlh.net 2018-02-18T00:33:26Z urn:sha1:19eef2cafc28a485d18145392977e3ad650569fe a DCP. Bump version 2018-02-17T00:51:43Z Carl Hetherington cth@carlh.net 2018-02-17T00:51:43Z urn:sha1:01238dc192e4864b1665a03661e684240ac7f884 Bump version 2018-02-17T00:51:43Z Carl Hetherington cth@carlh.net 2018-02-17T00:51:43Z urn:sha1:40c60c50f4c492298939b9400b916d1828a28b40 Fix crash on importing an encrypted DCP. 2018-02-17T00:25:11Z Carl Hetherington cth@carlh.net 2018-02-17T00:25:11Z urn:sha1:2a434c744338ff23ca99e21a130afaf042300ada Fix up test. 2018-02-17T00:23:06Z Carl Hetherington cth@carlh.net 2018-02-17T00:23:06Z urn:sha1:996efed5e50a17bd1ac570dd3d11d153286ccac7 Make import_dcp_test more fussy to expose a bug with importing encrypted DCPs without a KDM. 2018-02-17T00:04:57Z Carl Hetherington cth@carlh.net 2018-02-17T00:04:57Z urn:sha1:af2797a67f11e5cd06460f7ee582855feec3b5b5