X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.h;h=1b73e8fc71740c698aac7374b6f264388801636f;hb=58c63c02bc26209f42f42bccbe4a587f9df6f05f;hp=40ed181fe7f383d6489f2e14c9d88e2d2b19b788;hpb=47d83b296248119d04b9226fd51a67e2fd3faac5;p=dcpomatic.git

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 40ed181fe..1b73e8fc7 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -29,6 +29,7 @@
 
 
 #include "content.h"
+#include "font.h"
 #include <libcxml/cxml.h>
 #include <dcp/encrypted_kdm.h>
 #include <dcp/rating.h>
@@ -65,18 +66,18 @@ public:
 		return std::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ());
 	}
 
-	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const;
-	dcpomatic::DCPTime approximate_length () const;
+	dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const override;
+	dcpomatic::DCPTime approximate_length () const override;
 
-	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>);
-	std::string summary () const;
-	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *, bool with_paths) const;
-	std::string identifier () const;
-	void take_settings_from (std::shared_ptr<const Content> c);
+	void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>) override;
+	std::string summary () const override;
+	std::string technical_summary () const override;
+	void as_xml (xmlpp::Node *, bool with_paths) const override;
+	std::string identifier () const override;
+	void take_settings_from (std::shared_ptr<const Content> c) override;
 
 	void set_default_colour_conversion ();
-	std::list<dcpomatic::DCPTime> reel_split_points (std::shared_ptr<const Film> film) const;
+	std::list<dcpomatic::DCPTime> reel_split_points (std::shared_ptr<const Film> film) const override;
 
 	std::vector<boost::filesystem::path> directories () const;
 
@@ -92,7 +93,7 @@ public:
 		return _kdm;
 	}
 
-	bool can_be_played () const;
+	bool can_be_played () const override;
 	bool needs_kdm () const;
 	bool needs_assets () const;
 
@@ -170,10 +171,12 @@ public:
 		return _content_versions;
 	}
 
+	void check_font_ids();
+
 private:
 	friend struct reels_test5;
 
-	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
+	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty>& p) const override;
 
 	void read_directory (boost::filesystem::path);
 	void read_sub_directory (boost::filesystem::path);
@@ -222,4 +225,9 @@ private:
 };
 
 
+extern std::string id_for_font_in_reel(std::string id, int reel);
+extern void add_fonts_from_examiner(std::shared_ptr<TextContent> text, std::vector<std::vector<std::shared_ptr<dcpomatic::Font>>> const& fonts);
+
+
+
 #endif