Add Piece:fonts().

diff --git a/src/lib/piece.cc b/src/lib/piece.cc
index 16fcb32bcc72724f4c66fa454c22c0807fcf61ef..ca92f1db5e036eb7815f61657044d51ede938fab 100644 (file)
--- a/src/lib/piece.cc
+++ b/src/lib/piece.cc
@@ -33,6 +33,7 @@
 using std::dynamic_pointer_cast;
 using std::make_shared;
 using std::shared_ptr;
+using std::vector;
 using boost::optional;
 using namespace dcpomatic;
 
@@ -255,3 +256,9 @@ Piece::decoder_before(shared_ptr<const Film> film, optional<dcpomatic::DCPTime>
        return {};
 }
 
+vector<dcpomatic::FontData>
+Piece::fonts () const
+{
+       return decoder->fonts();
+}
+

diff --git a/src/lib/piece.h b/src/lib/piece.h
index 8f4b91f226119f0bcc7f5d9d8f6cadfd406a7cb7..ac11de55a92f08a69f0f84dc9cc2fa3f99278def 100644 (file)
--- a/src/lib/piece.h
+++ b/src/lib/piece.h
@@ -26,6 +26,7 @@
 #include "audio_stream.h"
 #include "content_video.h"
 #include "dcpomatic_time.h"
+#include "font_data.h"
 #include "frame_rate_change.h"
 #include "types.h"
 #include <map>
@@ -72,6 +73,7 @@ public:
 
        void seek (std::shared_ptr<const Film> film, dcpomatic::DCPTime time, bool accurate);
        boost::optional<dcpomatic::DCPTime> decoder_before(std::shared_ptr<const Film> film, boost::optional<dcpomatic::DCPTime> time);
+       std::vector<dcpomatic::FontData> fonts () const;
 
        std::shared_ptr<Decoder> decoder;
        boost::optional<dcpomatic::DCPTimePeriod> ignore_video;

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 91d4297086ad152ed33f9be9d5ed622c7c31a929..4f81f51f328e0c6eebb09e3b4f4dc1d28ba250f2 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -425,7 +425,7 @@ Player::get_subtitle_fonts ()
                /* XXX: things may go wrong if there are duplicate font IDs
                   with different font files.
                */
-               auto f = i->decoder->fonts ();
+               auto f = i->fonts ();
                copy (f.begin(), f.end(), back_inserter(fonts));
        }