projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in log message.
[dcpomatic.git]
/
src
/
lib
/
font.h
diff --git
a/src/lib/font.h
b/src/lib/font.h
index a6bf61e340c445c25970e620c15ac1d489b7efa4..24d8ed2bb93103027795c838a3b800ad1668b5c0 100644
(file)
--- a/
src/lib/font.h
+++ b/
src/lib/font.h
@@
-23,6
+23,7
@@
#define 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 <libcxml/cxml.h>
#include <boost/optional.hpp>
#include <boost/signals2.hpp>
@@
-46,12
+47,21
@@
public:
, _file (file)
{}
, _file (file)
{}
+ Font (std::string id, dcp::ArrayData data)
+ : _id (id)
+ , _data (data)
+ {}
+
void as_xml (xmlpp::Node* node);
std::string id () const {
return _id;
}
void as_xml (xmlpp::Node* node);
std::string id () const {
return _id;
}
+ void set_id (std::string id) {
+ _id = id;
+ }
+
boost::optional<boost::filesystem::path> file () const {
return _file;
}
boost::optional<boost::filesystem::path> file () const {
return _file;
}
@@
-61,11
+71,16
@@
public:
Changed ();
}
Changed ();
}
+ boost::optional<dcp::ArrayData> data() const;
+
boost::signals2::signal<void()> Changed;
private:
boost::signals2::signal<void()> Changed;
private:
- /** Font ID, used to describe it in the subtitle content */
+ /** 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;
std::string _id;
+ boost::optional<dcp::ArrayData> _data;
boost::optional<boost::filesystem::path> _file;
};
boost::optional<boost::filesystem::path> _file;
};