X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffont.h;h=b2ae86daff328d208a1e5c59d4f6b2ae83fe4b2f;hb=f77ec143719c86ddbf098bff6d19fe2a159b8c3e;hp=cb18e4798b6e7b29ef1863ddc8216a6c759431e1;hpb=731eb4282fc1dd8e2ac054879db16647757a766a;p=dcpomatic.git

diff --git a/src/lib/font.h b/src/lib/font.h
index cb18e4798..b2ae86daf 100644
--- a/src/lib/font.h
+++ b/src/lib/font.h
@@ -21,7 +21,6 @@
 #ifndef DCPOMATIC_FONT_H
 #define DCPOMATIC_FONT_H
 
-#include "font_files.h"
 #include <libcxml/cxml.h>
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
@@ -42,21 +41,12 @@ public:
 		return _id;
 	}
 
-	boost::optional<boost::filesystem::path> file (FontFiles::Variant variant) const {
-		return _files.get (variant);
+	boost::optional<boost::filesystem::path> file () const {
+		return _file;
 	}
 
-	void set_file (FontFiles::Variant variant, boost::filesystem::path file) {
-		_files.set (variant, file);
-		Changed ();
-	}
-
-	FontFiles files () const {
-		return _files;
-	}
-
-	void set_files (FontFiles files) {
-		_files = files;
+	void set_file (boost::filesystem::path file) {
+		_file = file;
 		Changed ();
 	}
 
@@ -65,7 +55,7 @@ public:
 private:
 	/** Font ID, used to describe it in the subtitle content */
 	std::string _id;
-	FontFiles _files;
+	boost::optional<boost::filesystem::path> _file;
 };
 
 bool operator!= (Font const & a, Font const & b);