dcpomatic/src/lib/player.cc, branch v2.13.41 DCP-o-matic DCP tools https://git.carlh.net/cgit/dcpomatic/atom?h=v2.13.41 2018-08-05T00:15:45Z Get closed caption view data from the butler, rather than the player. 2018-08-05T00:15:45Z Carl Hetherington cth@carlh.net 2018-08-05T00:15:45Z urn:sha1:3a7b6acdb993864f319a6ceb3bc4c3fb7d4aaefd You can't introduce the butler (so that the player is ahead of time) and then ask the player what should be in the frame that is being displayed "now"; the player will already have moved on. Some subtitle renaming. 2018-08-03T23:22:51Z Carl Hetherington cth@carlh.net 2018-08-03T23:22:51Z urn:sha1:0a5e92450ae992e9ed24026dd60ae351d0a3e60b A variety of changes to improve (but not entirely fix) behaviour 2018-08-02T22:22:49Z Carl Hetherington cth@carlh.net 2018-08-02T22:22:49Z urn:sha1:4fe1a062eb31d680b8b4ac0191b9e2fc2d6aaec3 when moving content (or otherwise changing the playlist) while playing. This commit refills the butler when things change in certain ways, and improves locking to cope with Player methods being called from the GUI and butler threads at the same time. Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic 2018-07-27T15:14:41Z Carl Hetherington cth@carlh.net 2018-07-27T15:14:41Z urn:sha1:ae4f0d9f55489ddc50b3e5f0d713621ee8f50645 Protect the public API of Player with a mutex, since 2018-07-26T19:59:04Z Carl Hetherington cth@carlh.net 2018-07-26T19:59:04Z urn:sha1:3009a585f5222a83213c786e3c564c740f450d18 seek() and pass() may be called from the Butler thread ad the same time as other Player methods are called from the GUI thread (by FilmViewer and ClosedCaptionViewDialog). Add support for ignoring everything except text in the player. 2018-07-26T14:07:09Z Carl Hetherington cth@carlh.net 2018-07-26T14:07:09Z urn:sha1:53e1b97984f7e8c7bf1b16a9f3a333578545ec10 Fix uninitialised variable. 2018-07-24T11:14:27Z Carl Hetherington cth@carlh.net 2018-07-24T11:14:27Z urn:sha1:54e0e2ab9a48944004424f423397f8dc54aec8c8 Tidy up after mass rename. 2018-07-23T14:10:11Z Carl Hetherington cth@carlh.net 2018-07-23T14:10:11Z urn:sha1:a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb More automated renaming. 2018-07-23T10:20:12Z Carl Hetherington cth@carlh.net 2018-07-23T10:20:12Z urn:sha1:df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc ActiveCaptions -> ActiveText BitmapCaption -> BitmapText ContentCaption -> ContentText ContentTextCaption -> ContentStringText TextCaptionFileContent -> StringTextFileContent TextCaptionFileDecoder -> StringTextFileDecoder TextCaptionFile -> StringTextFile TextCaption -> StringText PlayerCaption -> PlayerText CaptionContent -> TextContent CaptionDecoder -> TextDecoder CaptionPanel -> TextPanel CaptionView -> TextView CaptionAppearanceDialog -> SubtitleAppearanceDialog CaptionType -> TextType Get ccaps by asking the Player, rather than by listening to its emissions, 2018-07-23T00:21:07Z Carl Hetherington cth@carlh.net 2018-07-23T00:21:07Z urn:sha1:ded71cffd18962ebb6b9611a5eb6dfafe9e8e4ec which is slightly cleaner and works when subtitles are emitted with an unknown end time. Also add CCAPs to the player.