projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ISDCF name fixes with > 6 channels and HI/VI (#1633).
[dcpomatic.git]
/
src
/
lib
/
font.h
diff --git
a/src/lib/font.h
b/src/lib/font.h
index cb18e4798b6e7b29ef1863ddc8216a6c759431e1..5876bf8a46052cbbbd75ad2adb941a581b2c7029 100644
(file)
--- a/
src/lib/font.h
+++ b/
src/lib/font.h
@@
-21,13
+21,14
@@
#ifndef DCPOMATIC_FONT_H
#define DCPOMATIC_FONT_H
#ifndef DCPOMATIC_FONT_H
#define DCPOMATIC_FONT_H
-#include "font_files.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:
@@
-42,21
+43,12
@@
public:
return _id;
}
return _id;
}
- boost::optional<boost::filesystem::path> file (
FontFiles::Variant variant
) const {
- return _file
s.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 ();
}
Changed ();
}
@@
-65,10
+57,12
@@
public:
private:
/** Font ID, used to describe it in the subtitle content */
std::string _id;
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);
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