diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-08-25 21:58:48 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-08-25 21:58:48 +0200 |
| commit | 8475d7b7d70d5b98e7737f326653d80a9fd8e9cf (patch) | |
| tree | 2a3eccbe46591d2bde7ff607890e5de5225d4a9f /src/lib/reel_writer.cc | |
| parent | 75f6cc0fa8bcff9b98a31200e313d8895cfaa3f8 (diff) | |
Move the code to find Liberation into util.cc.
Diffstat (limited to 'src/lib/reel_writer.cc')
| -rw-r--r-- | src/lib/reel_writer.cc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 770130798..f5f21f2ea 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -439,24 +439,9 @@ maybe_add_text ( shared_ptr<T> reel_asset; if (asset) { - boost::filesystem::path liberation_normal; - try { - liberation_normal = shared_path() / "LiberationSans-Regular.ttf"; - if (!boost::filesystem::exists (liberation_normal)) { - /* Hack for unit tests */ - liberation_normal = shared_path() / "fonts" / "LiberationSans-Regular.ttf"; - } - } catch (boost::filesystem::filesystem_error& e) { - - } - - if (!boost::filesystem::exists(liberation_normal)) { - liberation_normal = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf"; - } - /* Add the font to the subtitle content */ BOOST_FOREACH (shared_ptr<Font> j, fonts) { - asset->add_font (j->id(), j->file().get_value_or(liberation_normal)); + asset->add_font (j->id(), j->file().get_value_or(default_font_file())); } if (dynamic_pointer_cast<dcp::InteropSubtitleAsset> (asset)) { |