projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HaX.
[dcpomatic.git]
/
src
/
lib
/
subtitle_encoder.cc
diff --git
a/src/lib/subtitle_encoder.cc
b/src/lib/subtitle_encoder.cc
index ba47e1231067f917e2ada7e160c3c2e21302aa94..2331eb52a8871241ba3ce58a87a3a99348a7aebf 100644
(file)
--- a/
src/lib/subtitle_encoder.cc
+++ b/
src/lib/subtitle_encoder.cc
@@
-20,7
+20,6
@@
#include "compose.hpp"
#include "compose.hpp"
-#include "font_data.h"
#include "job.h"
#include "player.h"
#include "subtitle_encoder.h"
#include "job.h"
#include "player.h"
#include "subtitle_encoder.h"
@@
-121,7
+120,7
@@
SubtitleEncoder::go ()
if (!_film->interop() || _include_font) {
for (auto j: _player->get_subtitle_fonts()) {
if (!_film->interop() || _include_font) {
for (auto j: _player->get_subtitle_fonts()) {
- i.first->add_font
(j.id, _default_font
);
+ i.first->add_font
(j->id(), j->data().get_value_or(_default_font)
);
}
}
}
}