X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffont.h;h=24d8ed2bb93103027795c838a3b800ad1668b5c0;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=7a26eefc9227f0f11554a9c9d9b5cfa4aa182fe7;hpb=ed8491f8c5710ad8901021a12c3b187e29201f71;p=dcpomatic.git

diff --git a/src/lib/font.h b/src/lib/font.h
index 7a26eefc9..24d8ed2bb 100644
--- a/src/lib/font.h
+++ b/src/lib/font.h
@@ -1,43 +1,94 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 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 <dcp/array_data.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 () {}
+	explicit Font (std::string id)
+		: _id (id) {}
+
+	explicit Font (cxml::NodePtr node);
 
-	Font (std::string id_)
-		: id (id_) {}
+	Font (std::string id, boost::filesystem::path file)
+		: _id (id)
+		, _file (file)
+	{}
 
-	Font (cxml::NodePtr node);
+	Font (std::string id, dcp::ArrayData data)
+		: _id (id)
+		, _data (data)
+	{}
 
 	void as_xml (xmlpp::Node* node);
-	
-	/** Font ID, or empty for the default font */
-	boost::optional<std::string> id;
-	boost::optional<boost::filesystem::path> file;
+
+	std::string id () const {
+		return _id;
+	}
+
+	void set_id (std::string id) {
+		_id = id;
+	}
+
+	boost::optional<boost::filesystem::path> file () const {
+		return _file;
+	}
+
+	void set_file (boost::filesystem::path file) {
+		_file = file;
+		Changed ();
+	}
+
+	boost::optional<dcp::ArrayData> data() const;
+
+	boost::signals2::signal<void()> Changed;
+
+private:
+	/** Font ID, used to describe it in the subtitle content; could be either a
+	 *  font family name or an ID from some DCP font XML.
+	 */
+	std::string _id;
+	boost::optional<dcp::ArrayData> _data;
+	boost::optional<boost::filesystem::path> _file;
 };
 
-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