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

author	Carl Hetherington <cth@carlh.net>
	Wed, 1 Jun 2022 11:03:38 +0000 (13:03 +0200)
committer	Carl Hetherington <cth@carlh.net>
	Tue, 7 Jun 2022 15:01:06 +0000 (17:01 +0200)
commit	5a820bb8fae34591be5ac6d19a73461b9dab532a
tree	098e2dc959b6df0fefa62b2976976afc9f81b96b	tree \| snapshot
parent	9a7b67aee32a40539f29bc2d7017edd4a4f65f11	commit \| diff

Rearrange subtitle font management.

With this change each subtitle coming out of the player has a reference
to a dcpomatic::Font that belongs to the TextContent. This hopefully
solves a few problems which all basically stemmed from the fact that
previously the decoders/player were deciding what the font ID in the
output DCP would be - they can't do that properly.

42 files changed:

src/lib/analyse_subtitles_job.cc		diff \| blob \| history
src/lib/content_text.h		diff \| blob \| history
src/lib/dcp_decoder.cc		diff \| blob \| history
src/lib/dcp_decoder.h		diff \| blob \| history
src/lib/dcp_encoder.cc		diff \| blob \| history
src/lib/dcp_subtitle_decoder.cc		diff \| blob \| history
src/lib/dcp_subtitle_decoder.h		diff \| blob \| history
src/lib/decoder.h		diff \| blob \| history
src/lib/font.cc		diff \| blob \| history
src/lib/font.h		diff \| blob \| history
src/lib/font_data.cc	[deleted file]	blob \| history
src/lib/font_data.h	[deleted file]	blob \| history
src/lib/font_id_map.cc	[new file with mode: 0644]	blob
src/lib/font_id_map.h	[new file with mode: 0644]	blob
src/lib/hints.cc		diff \| blob \| history
src/lib/player.cc		diff \| blob \| history
src/lib/player.h		diff \| blob \| history
src/lib/player_text.cc	[deleted file]	blob \| history
src/lib/player_text.h		diff \| blob \| history
src/lib/reel_writer.cc		diff \| blob \| history
src/lib/reel_writer.h		diff \| blob \| history
src/lib/render_text.cc		diff \| blob \| history
src/lib/render_text.h		diff \| blob \| history
src/lib/string_text.h		diff \| blob \| history
src/lib/string_text_file.h		diff \| blob \| history
src/lib/string_text_file_content.cc		diff \| blob \| history
src/lib/string_text_file_decoder.cc		diff \| blob \| history
src/lib/string_text_file_decoder.h		diff \| blob \| history
src/lib/subtitle_encoder.cc		diff \| blob \| history
src/lib/subtitle_encoder.h		diff \| blob \| history
src/lib/text_content.cc		diff \| blob \| history
src/lib/text_content.h		diff \| blob \| history
src/lib/text_decoder.cc		diff \| blob \| history
src/lib/util.cc		diff \| blob \| history
src/lib/writer.cc		diff \| blob \| history
src/lib/writer.h		diff \| blob \| history
src/lib/wscript		diff \| blob \| history
src/wx/fonts_dialog.cc		diff \| blob \| history
test/dcp_subtitle_test.cc		diff \| blob \| history
test/render_subtitles_test.cc		diff \| blob \| history
test/srt_subtitle_test.cc		diff \| blob \| history
test/writer_test.cc		diff \| blob \| history

2.0 development branch of dcpomatic

RSS Atom