dcpomatic, branch v2.11.59 DCP-o-matic DCP tools https://git.carlh.net/cgit/dcpomatic/atom?h=v2.11.59 2018-02-21T00:47:14Z Bump version 2018-02-21T00:47:14Z Carl Hetherington cth@carlh.net 2018-02-21T00:47:14Z urn:sha1:f02edadc366c20fcad85beec932ab0403bf5eb99 Add a 2-frame `delay' on content arriving at the player to give 2018-02-20T23:34:59Z Carl Hetherington cth@carlh.net 2018-02-20T23:34:59Z urn:sha1:775826079275839005d2168b190f96e32215afd0 subtitle content the chance to catch up. Fixes problems observed when overlaying a DCP subtitle onto an existing DCP and then seeking into the first subtitle. After the seek the decoder positions were: DCP: 0. subtitle: first subtitle time. This causes the DCP decoder to be pass()ed first and so the subtitle for the video frame has not arrived yet. I hope this does not cause unpredicted side effects... Add a possible pure virtual method. 2018-02-20T23:34:32Z Carl Hetherington cth@carlh.net 2018-02-20T23:34:32Z urn:sha1:66f15e8fc998061c78675e499fa88ab1e17e318d Bump version 2018-02-18T01:31:39Z Carl Hetherington cth@carlh.net 2018-02-18T01:31:39Z urn:sha1:1f86813144e0b036519454dff2bf5648d9de2e2a 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