projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix default placement of SRT (etc.) now that the alignment has changed
[dcpomatic.git]
/
src
/
lib
/
font.h
diff --git
a/src/lib/font.h
b/src/lib/font.h
index 0dd63448e7557edd089b70ed9889e8a3a8977064..24d8ed2bb93103027795c838a3b800ad1668b5c0 100644
(file)
--- a/
src/lib/font.h
+++ b/
src/lib/font.h
@@
-1,38
+1,56
@@
/*
/*
- Copyright (C) 2014-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
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.
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
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
#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>
#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:
- Font (std::string id)
+
explicit
Font (std::string id)
: _id (id) {}
: _id (id) {}
- 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);
void as_xml (xmlpp::Node* node);
@@
-40,6
+58,10
@@
public:
return _id;
}
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;
}
@@
-49,15
+71,24
@@
public:
Changed ();
}
Changed ();
}
+ boost::optional<dcp::ArrayData> data() const;
+
boost::signals2::signal<void()> Changed;
boost::signals2::signal<void()> Changed;
-private:
- /** Font ID, used to describe it in the subtitle content */
+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;
std::string _id;
+ boost::optional<dcp::ArrayData> _data;
boost::optional<boost::filesystem::path> _file;
};
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
#endif