X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Freel_writer.cc;h=f5f21f2eac92e5799a901370ecd44c394d654ee2;hp=770130798010ab0bd9290f0fa80fac8daf112e0d;hb=8475d7b7d70d5b98e7737f326653d80a9fd8e9cf;hpb=75f6cc0fa8bcff9b98a31200e313d8895cfaa3f8 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 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 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 (asset)) {