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

author	Carl Hetherington <cth@carlh.net>
	Thu, 25 Jun 2015 10:58:12 +0000 (11:58 +0100)
committer	Carl Hetherington <cth@carlh.net>
	Thu, 25 Jun 2015 12:36:17 +0000 (13:36 +0100)
commit	89ee4cc6019036fa4fc0a6e07e052ffdc3b136ac
tree	5a1d1b3e1e6fc4d280f1ff0f1598a37e0fea3257	tree \| snapshot
parent	e08c1d30bb5e2d77339541eb7dbe7d1ca95485ab	commit \| diff

Make player decide whether subtitles should be burnt based on
content settings rather than using the film's settings. Remove
film property of burn-subtitles.

21 files changed:

src/lib/dcp_video.cc		diff \| blob \| history
src/lib/dcp_video.h		diff \| blob \| history
src/lib/encoder.cc		diff \| blob \| history
src/lib/film.cc		diff \| blob \| history
src/lib/film.h		diff \| blob \| history
src/lib/player.cc		diff \| blob \| history
src/lib/player.h		diff \| blob \| history
src/lib/player_video.cc		diff \| blob \| history
src/lib/player_video.h		diff \| blob \| history
src/lib/transcoder.cc		diff \| blob \| history
src/tools/server_test.cc		diff \| blob \| history
src/wx/dcp_panel.cc		diff \| blob \| history
src/wx/dcp_panel.h		diff \| blob \| history
src/wx/film_viewer.cc		diff \| blob \| history
test/burnt_subtitle_test.cc		diff \| blob \| history
test/client_server_test.cc		diff \| blob \| history
test/data		diff \| blob \| history
test/dcp_subtitle_test.cc		diff \| blob \| history
test/srt_subtitle_test.cc		diff \| blob \| history
test/time_calculation_test.cc		diff \| blob \| history
test/xml_subtitle_test.cc		diff \| blob \| history

2.0 development branch of dcpomatic

RSS Atom