From 5f8bb6c42ebcc92d05c1d160ac66d00b202cd6ef Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 23 Jun 2020 22:50:54 +0200
Subject: [PATCH] Add add_fonts() to Piece.

---
 src/lib/piece.h   | 2 ++
 src/lib/player.cc | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/lib/piece.h b/src/lib/piece.h
index deeecfa2f..31fbfc256 100644
--- a/src/lib/piece.h
+++ b/src/lib/piece.h
@@ -45,6 +45,8 @@ public:
 	dcpomatic::ContentTime dcp_to_content_time (boost::shared_ptr<const Film> film, dcpomatic::DCPTime t) const;
 	dcpomatic::DCPTime content_time_to_dcp (dcpomatic::ContentTime t) const;
 
+	void add_fonts (std::list<boost::shared_ptr<dcpomatic::Font> >& fonts) const;
+
 private:
 	std::vector<boost::shared_ptr<Content> > _content;
 	std::vector<boost::shared_ptr<Decoder> > _decoder;
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 2aa23bc15..9445d63b8 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -394,13 +394,7 @@ Player::get_subtitle_fonts ()
 
 	list<shared_ptr<Font> > fonts;
 	BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
-		BOOST_FOREACH (shared_ptr<TextContent> j, i->content->text) {
-			/* XXX: things may go wrong if there are duplicate font IDs
-			   with different font files.
-			*/
-			list<shared_ptr<Font> > f = j->fonts ();
-			copy (f.begin(), f.end(), back_inserter (fonts));
-		}
+		i->add_fonts (fonts);
 	}
 
 	return fonts;
-- 
2.30.2