X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffont.h;h=cb18e4798b6e7b29ef1863ddc8216a6c759431e1;hb=c6871fe8617b3de03662b7630355059393bf8043;hp=0dd63448e7557edd089b70ed9889e8a3a8977064;hpb=acd023e023cfd0c4ccde3d658d038083e2071661;p=dcpomatic.git

diff --git a/src/lib/font.h b/src/lib/font.h
index 0dd63448e..cb18e4798 100644
--- a/src/lib/font.h
+++ b/src/lib/font.h
@@ -1,25 +1,27 @@
 /*
     Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #ifndef DCPOMATIC_FONT_H
 #define DCPOMATIC_FONT_H
 
+#include "font_files.h"
 #include <libcxml/cxml.h>
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
@@ -29,10 +31,10 @@
 class Font
 {
 public:
-	Font (std::string id)
+	explicit Font (std::string id)
 		: _id (id) {}
 
-	Font (cxml::NodePtr node);
+	explicit Font (cxml::NodePtr node);
 
 	void as_xml (xmlpp::Node* node);
 
@@ -40,24 +42,33 @@ public:
 		return _id;
 	}
 
-	boost::optional<boost::filesystem::path> file () const {
-		return _file;
+	boost::optional<boost::filesystem::path> file (FontFiles::Variant variant) const {
+		return _files.get (variant);
+	}
+
+	void set_file (FontFiles::Variant variant, boost::filesystem::path file) {
+		_files.set (variant, file);
+		Changed ();
+	}
+
+	FontFiles files () const {
+		return _files;
 	}
 
-	void set_file (boost::filesystem::path file) {
-		_file = file;
+	void set_files (FontFiles files) {
+		_files = files;
 		Changed ();
 	}
 
 	boost::signals2::signal<void()> Changed;
 
-private:	
+private:
 	/** Font ID, used to describe it in the subtitle content */
 	std::string _id;
-	boost::optional<boost::filesystem::path> _file;
+	FontFiles _files;
 };
 
-bool
-operator!= (Font const & a, Font const & b);
+bool operator!= (Font const & a, Font const & b);
+bool operator== (Font const & a, Font const & b);
 
 #endif