1 files changed, 17 insertions, 16 deletions

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 56a13874b..c85b7c126 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -27,6 +27,7 @@
 #include "atmos_metadata.h"
 #include "decoder.h"
 #include "font_id_allocator.h"
+#include "text_type.h"
 #include <dcp/mono_j2k_picture_asset_reader.h>
 #include <dcp/stereo_j2k_picture_asset_reader.h>
 #include <dcp/mono_mpeg2_picture_asset_reader.h>
@@ -37,6 +38,7 @@
 
 namespace dcp {
 	class Reel;
+	class ReelTextAsset;
 }
 
 class DCPContent;
@@ -47,7 +49,7 @@ struct dcp_subtitle_within_dcp_test;
 class DCPDecoder : public Decoder
 {
 public:
-	DCPDecoder (
+	DCPDecoder(
 		std::shared_ptr<const Film> film,
 		std::shared_ptr<const DCPContent> content,
 		bool fast,
@@ -55,37 +57,36 @@ public:
 		std::shared_ptr<DCPDecoder> old
 		);
 
-	std::vector<std::shared_ptr<dcp::Reel>> reels () const {
+	std::vector<std::shared_ptr<dcp::Reel>> reels() const {
 		return _reels;
 	}
 
-	void set_decode_referenced (bool r);
-	void set_forced_reduction (boost::optional<int> reduction);
+	void set_decode_referenced(bool r);
+	void set_forced_reduction(boost::optional<int> reduction);
 
-	bool pass () override;
-	void seek (dcpomatic::ContentTime t, bool accurate) override;
+	bool pass() override;
+	void seek(dcpomatic::ContentTime t, bool accurate) override;
 
-	std::string lazy_digest () const {
+	std::string lazy_digest() const {
 		return _lazy_digest;
 	}
 
-	dcpomatic::ContentTime position () const override;
+	dcpomatic::ContentTime position() const override;
 
 private:
 	friend struct dcp_subtitle_within_dcp_test;
 
-	void next_reel ();
-	void get_readers ();
-	void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
-	void pass_texts (
+	void next_reel();
+	void get_readers();
+	void pass_texts(dcpomatic::ContentTime next, dcp::Size size);
+	void pass_texts(
 		dcpomatic::ContentTime next,
-		std::shared_ptr<dcp::TextAsset> asset,
-		bool reference,
-		int64_t entry_point,
+		std::shared_ptr<dcp::ReelTextAsset> reel_asset,
+		TextType type,
 		std::shared_ptr<TextDecoder> decoder,
 		dcp::Size size
 		);
-	std::string calculate_lazy_digest (std::shared_ptr<const DCPContent>) const;
+	std::string calculate_lazy_digest(std::shared_ptr<const DCPContent>) const;
 
 	std::shared_ptr<const DCPContent> _dcp_content;