Make a parent for SMPTELoadFont and InteropLoadFont.

10 files changed, 30 insertions, 10 deletions

diff --git a/src/interop_load_font.cc b/src/interop_load_font.cc
index dede5696..d29e49de 100644
--- a/src/interop_load_font.cc
+++ b/src/interop_load_font.cc
@@ -26,7 +26,7 @@ using boost::optional;
 using namespace dcp;
 
 InteropLoadFont::InteropLoadFont (string id_, string uri_)
-	: id (id_)
+	: LoadFont (id_)
 	, uri (uri_)
 {
 
diff --git a/src/interop_load_font.h b/src/interop_load_font.h
index c553b557..0ab39ad4 100644
--- a/src/interop_load_font.h
+++ b/src/interop_load_font.h
@@ -17,20 +17,20 @@
 
 */
 
+#include "load_font.h"
 #include <libcxml/cxml.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 
 namespace dcp {
 	
-class InteropLoadFont 
+class InteropLoadFont : public LoadFont
 {
 public:
 	InteropLoadFont () {}
 	InteropLoadFont (std::string id, std::string uri);
 	InteropLoadFont (cxml::ConstNodePtr node);
 
-	std::string id;
 	std::string uri;
 };
 
diff --git a/src/interop_subtitle_content.cc b/src/interop_subtitle_content.cc
index 09b30e99..45977d67 100644
--- a/src/interop_subtitle_content.cc
+++ b/src/interop_subtitle_content.cc
@@ -210,3 +210,11 @@ InteropSubtitleContent::equals (shared_ptr<const Asset> other_asset, EqualityOpt
 
 	return true;
 }
+
+list<shared_ptr<LoadFont> >
+InteropSubtitleContent::load_font_nodes () const
+{
+	list<shared_ptr<LoadFont> > lf;
+	copy (_load_font_nodes.begin(), _load_font_nodes.end(), back_inserter (lf));
+	return lf;
+}
diff --git a/src/interop_subtitle_content.h b/src/interop_subtitle_content.h
index 9dfde104..adb45c6b 100644
--- a/src/interop_subtitle_content.h
+++ b/src/interop_subtitle_content.h
@@ -36,9 +36,7 @@ public:
 		boost::function<void (NoteType, std::string)> note
 		) const;
 
-	std::list<boost::shared_ptr<InteropLoadFont> > load_font_nodes () const {
-		return _load_font_nodes;
-	}
+	std::list<boost::shared_ptr<LoadFont> > load_font_nodes () const;
 
 	void add_font (std::string id, std::string uri);
 	
diff --git a/src/smpte_load_font.cc b/src/smpte_load_font.cc
index 90e9c993..0991f7db 100644
--- a/src/smpte_load_font.cc
+++ b/src/smpte_load_font.cc
@@ -25,7 +25,7 @@ using boost::shared_ptr;
 using namespace dcp;
 
 SMPTELoadFont::SMPTELoadFont (shared_ptr<const cxml::Node> node)
+	: LoadFont (node->string_attribute ("ID"))
 {
-	id = node->string_attribute ("ID");
 	urn = node->content().substr (9);
 }
diff --git a/src/smpte_load_font.h b/src/smpte_load_font.h
index d8d1fa66..7df9ea29 100644
--- a/src/smpte_load_font.h
+++ b/src/smpte_load_font.h
@@ -17,6 +17,7 @@
 
 */
 
+#include "load_font.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 
@@ -26,13 +27,12 @@ namespace cxml {
 
 namespace dcp {
 	
-class SMPTELoadFont 
+class SMPTELoadFont : public LoadFont
 {
 public:
 	SMPTELoadFont () {}
 	SMPTELoadFont (boost::shared_ptr<const cxml::Node> node);
 
-	std::string id;
 	std::string urn;
 };
 
diff --git a/src/smpte_subtitle_content.cc b/src/smpte_subtitle_content.cc
index d34c1dbe..e54b33c3 100644
--- a/src/smpte_subtitle_content.cc
+++ b/src/smpte_subtitle_content.cc
@@ -67,3 +67,11 @@ SMPTESubtitleContent::SMPTESubtitleContent (boost::filesystem::path file, bool m
 
 	parse_common (xml, font_nodes);
 }
+
+list<shared_ptr<LoadFont> >
+SMPTESubtitleContent::load_font_nodes () const
+{
+	list<shared_ptr<LoadFont> > lf;
+	copy (_load_font_nodes.begin(), _load_font_nodes.end(), back_inserter (lf));
+	return lf;
+}
diff --git a/src/smpte_subtitle_content.h b/src/smpte_subtitle_content.h
index 70f6f260..8faea817 100644
--- a/src/smpte_subtitle_content.h
+++ b/src/smpte_subtitle_content.h
@@ -31,6 +31,8 @@ public:
 	 */
 	SMPTESubtitleContent (boost::filesystem::path file, bool mxf = true);
 
+	std::list<boost::shared_ptr<LoadFont> > load_font_nodes () const;
+	
 private:
 	std::list<boost::shared_ptr<SMPTELoadFont> > _load_font_nodes;
 };
diff --git a/src/subtitle_content.h b/src/subtitle_content.h
index 94b46868..7121387a 100644
--- a/src/subtitle_content.h
+++ b/src/subtitle_content.h
@@ -32,6 +32,7 @@ class SubtitleString;
 class Font;
 class Text;
 class Subtitle;
+class LoadFont;
 
 /** @class SubtitleContent
  *  @brief A parent for classes representing a file containing subtitles.
@@ -67,8 +68,10 @@ public:
 
 	Time latest_subtitle_out () const;
 
+	virtual std::list<boost::shared_ptr<LoadFont> > load_font_nodes () const = 0;
+
 protected:
-	void parse_common (boost::shared_ptr<cxml::Document> xml, std::list<boost::shared_ptr<dcp::Font> > font_nodes);
+	void parse_common (boost::shared_ptr<cxml::Document> xml, std::list<boost::shared_ptr<Font> > font_nodes);
 	
 	std::string pkl_type (Standard) const {
 		return "text/xml";
diff --git a/src/wscript b/src/wscript
index ae2983a9..d6444aee 100644
--- a/src/wscript
+++ b/src/wscript
@@ -82,6 +82,7 @@ def build(bld):
               interop_load_font.h
               interop_subtitle_content.h
               key.h
+              load_font.h
               local_time.h
               metadata.h
               mono_picture_mxf.h