projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add create support for some more audio channels.
[dcpomatic.git]
/
src
/
lib
/
font.h
diff --git
a/src/lib/font.h
b/src/lib/font.h
index cb18e4798b6e7b29ef1863ddc8216a6c759431e1..24d8ed2bb93103027795c838a3b800ad1668b5c0 100644
(file)
--- a/
src/lib/font.h
+++ b/
src/lib/font.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,16
+18,22
@@
*/
*/
+
#ifndef DCPOMATIC_FONT_H
#define DCPOMATIC_FONT_H
#ifndef DCPOMATIC_FONT_H
#define DCPOMATIC_FONT_H
-#include "font_files.h"
+
+#include <dcp/array_data.h>
#include <libcxml/cxml.h>
#include <boost/optional.hpp>
#include <boost/signals2.hpp>
#include <boost/filesystem.hpp>
#include <string>
#include <libcxml/cxml.h>
#include <boost/optional.hpp>
#include <boost/signals2.hpp>
#include <boost/filesystem.hpp>
#include <string>
+
+namespace dcpomatic {
+
+
class Font
{
public:
class Font
{
public:
@@
-36,39
+42,53
@@
public:
explicit Font (cxml::NodePtr node);
explicit Font (cxml::NodePtr node);
+ Font (std::string id, boost::filesystem::path file)
+ : _id (id)
+ , _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;
}
-
boost::optional<boost::filesystem::path> file (FontFiles::Variant variant) const
{
-
return _files.get (variant)
;
+
void set_id (std::string id)
{
+
_id = id
;
}
}
- 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_file
s (FontFiles files
) {
- _file
s = files
;
+ void set_file
(boost::filesystem::path file
) {
+ _file
= file
;
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;
- FontFiles _files;
+ 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);
bool operator== (Font const & a, Font const & b);
+
+}
+
#endif
#endif