X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ffont.h;h=5876bf8a46052cbbbd75ad2adb941a581b2c7029;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hp=c165fea9fedcb30b7c5083f5c36725d99e7c5647;hpb=9bf2cf3509380663e6943f6b0d22dbec6002c332;p=dcpomatic.git

diff --git a/src/lib/font.h b/src/lib/font.h
index c165fea9f..5876bf8a4 100644
--- a/src/lib/font.h
+++ b/src/lib/font.h
@@ -1,39 +1,41 @@
 /*
     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>
 #include <boost/filesystem.hpp>
 #include <string>
 
+namespace dcpomatic {
+
 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);
 
@@ -41,21 +43,12 @@ public:
 		return _id;
 	}
 
-	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;
+	boost::optional<boost::filesystem::path> file () const {
+		return _file;
 	}
 
-	void set_files (FontFiles files) {
-		_files = files;
+	void set_file (boost::filesystem::path file) {
+		_file = file;
 		Changed ();
 	}
 
@@ -64,10 +57,12 @@ 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);
 bool operator== (Font const & a, Font const & b);
 
+}
+
 #endif