X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffont.cc;h=019c9ab076fe8f83e362c8030f2542b4beceb1df;hp=309f3d1eb3a6eab77673d75b5d58802b9c376a6e;hb=ce17803bf356f3e796dccde43b4cc3656609e7fc;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05

diff --git a/src/lib/font.cc b/src/lib/font.cc
index 309f3d1eb..019c9ab07 100644
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -24,24 +24,15 @@
 #include <boost/foreach.hpp>
 
 using std::string;
-
-static char const * names[] = {
-	"Normal",
-	"Italic",
-	"Bold"
-};
+using namespace dcpomatic;
 
 Font::Font (cxml::NodePtr node)
 	: _id (node->string_child ("Id"))
 {
-	DCPOMATIC_ASSERT (FontFiles::VARIANTS == 3);
-
-	BOOST_FOREACH (cxml::NodePtr i, node->node_children ("File")) {
+	BOOST_FOREACH (cxml::NodePtr i, node->node_children("File")) {
 		string variant = i->optional_string_attribute("Variant").get_value_or ("Normal");
-		for (int j = 0; j < FontFiles::VARIANTS; ++j) {
-			if (variant == names[j]) {
-				_files.set (static_cast<FontFiles::Variant>(j), i->content());
-			}
+		if (variant == "Normal") {
+			_file = i->content();
 		}
 	}
 }
@@ -49,37 +40,25 @@ Font::Font (cxml::NodePtr node)
 void
 Font::as_xml (xmlpp::Node* node)
 {
-	DCPOMATIC_ASSERT (FontFiles::VARIANTS == 3);
-
 	node->add_child("Id")->add_child_text (_id);
-	for (int i = 0; i < FontFiles::VARIANTS; ++i) {
-		if (_files.get(static_cast<FontFiles::Variant>(i))) {
-			xmlpp::Element* e = node->add_child ("File");
-			e->set_attribute ("Variant", names[i]);
-			e->add_child_text (_files.get(static_cast<FontFiles::Variant>(i)).get().string ());
-		}
+	if (_file) {
+		node->add_child("File")->add_child_text(_file->string());
 	}
 }
 
 
 bool
-operator== (Font const & a, Font const & b)
+dcpomatic::operator== (Font const & a, Font const & b)
 {
 	if (a.id() != b.id()) {
 		return false;
 	}
 
-	for (int i = 0; i < FontFiles::VARIANTS; ++i) {
-		if (a.file(static_cast<FontFiles::Variant>(i)) != b.file(static_cast<FontFiles::Variant>(i))) {
-			return false;
-		}
-	}
-
-	return true;
+	return a.file() == b.file();
 }
 
 bool
-operator!= (Font const & a, Font const & b)
+dcpomatic::operator!= (Font const & a, Font const & b)
 {
 	return !(a == b);
 }