git.carlh.net Git - dcpomatic.git/commit

projects / dcpomatic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 07d75f4) | patch

author	Carl Hetherington <cth@carlh.net>
	Mon, 23 Jul 2018 00:21:07 +0000 (01:21 +0100)
committer	Carl Hetherington <cth@carlh.net>
	Mon, 23 Jul 2018 00:21:07 +0000 (01:21 +0100)
commit	ded71cffd18962ebb6b9611a5eb6dfafe9e8e4ec
tree	6da7f5da15b7b4cdeb82f7099b549abf537bf4fa	tree \| snapshot
parent	07d75f41aed77e340d927cc092dc4e7d74d03897	commit \| diff

Get ccaps by asking the Player, rather than by listening to its emissions,
which is slightly cleaner and works when subtitles are emitted with an
unknown end time. Also add CCAPs to the player.

12 files changed:

src/lib/active_captions.cc		diff \| blob \| history
src/lib/active_captions.h		diff \| blob \| history
src/lib/caption_content.cc		diff \| blob \| history
src/lib/player.cc		diff \| blob \| history
src/lib/player.h		diff \| blob \| history
src/tools/dcpomatic_player.cc		diff \| blob \| history
src/wx/closed_captions_dialog.cc		diff \| blob \| history
src/wx/closed_captions_dialog.h		diff \| blob \| history
src/wx/closed_captions_view.cc	[deleted file]	blob \| history
src/wx/closed_captions_view.h	[deleted file]	blob \| history
src/wx/film_viewer.cc		diff \| blob \| history
src/wx/film_viewer.h		diff \| blob \| history

2.0 development branch of dcpomatic