summaryrefslogtreecommitdiff
path: root/src/lib/font.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-01-27 00:25:40 +0000
committerCarl Hetherington <cth@carlh.net>2019-01-27 00:25:40 +0000
commitf77ec143719c86ddbf098bff6d19fe2a159b8c3e (patch)
tree0eef7caeaff253a5d6b4c8f65cb5a0fc327d2f7c /src/lib/font.h
parent731eb4282fc1dd8e2ac054879db16647757a766a (diff)
Remove specification of italic/bold fonts (#1451); synthesis will be used instead.v2.13.110
Diffstat (limited to 'src/lib/font.h')
-rw-r--r--src/lib/font.h20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/lib/font.h b/src/lib/font.h
index cb18e4798..b2ae86daf 100644
--- a/src/lib/font.h
+++ b/src/lib/font.h
@@ -21,7 +21,6 @@
#ifndef DCPOMATIC_FONT_H
#define DCPOMATIC_FONT_H
-#include "font_files.h"
#include <libcxml/cxml.h>
#include <boost/optional.hpp>
#include <boost/signals2.hpp>
@@ -42,21 +41,12 @@ public:
return _id;
}
- boost::optional<boost::filesystem::path> file (FontFiles::Variant variant) const {
- return _files.get (variant);
+ boost::optional<boost::filesystem::path> file () const {
+ return _file;
}
- void set_file (FontFiles::Variant variant, boost::filesystem::path file) {
- _files.set (variant, file);
- Changed ();
- }
-
- FontFiles files () const {
- return _files;
- }
-
- void set_files (FontFiles files) {
- _files = files;
+ void set_file (boost::filesystem::path file) {
+ _file = file;
Changed ();
}
@@ -65,7 +55,7 @@ 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);