From 5a820bb8fae34591be5ac6d19a73461b9dab532a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 1 Jun 2022 13:03:38 +0200
Subject: 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.
---
 src/lib/wscript | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/lib/wscript')

diff --git a/src/lib/wscript b/src/lib/wscript
index 285ebfab5..6bab60d54 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -114,8 +114,8 @@ sources = """
           film.cc
           filter.cc
           font.cc
-          font_data.cc
           font_config.cc
+          font_id_map.cc
           frame_interval_checker.cc
           frame_rate_change.cc
           guess_crop.cc
@@ -146,7 +146,6 @@ sources = """
           overlaps.cc
           pixel_quanta.cc
           player.cc
-          player_text.cc
           player_video.cc
           playlist.cc
           position_image.cc
-- 
cgit v1.2.3