#include "font.h"
#include "dcpomatic_assert.h"
#include "warnings.h"
+#include "util.h"
#include <dcp/raw_convert.h>
#include <fontconfig/fontconfig.h>
#include <cairomm/cairomm.h>
fc_config = FcInitLoadConfig ();
}
- optional<boost::filesystem::path> font_file;
-
- try {
- font_file = shared_path () / "LiberationSans-Regular.ttf";
- } catch (boost::filesystem::filesystem_error& e) {
-
- }
-
- /* Hack: try the debian/ubuntu locations if getting the shared path failed */
-
- if (!font_file || !boost::filesystem::exists(*font_file)) {
- font_file = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf";
- }
+ optional<boost::filesystem::path> font_file = default_font_file ();
BOOST_FOREACH (shared_ptr<Font> i, fonts) {
if (i->id() == subtitle.font() && i->file()) {
create_layout()
{
PangoFontMap* c_font_map = pango_cairo_font_map_new ();
+ DCPOMATIC_ASSERT (c_font_map);
Glib::RefPtr<Pango::FontMap> font_map = Glib::wrap (c_font_map);
PangoContext* c_context = pango_font_map_create_context (c_font_map);
+ DCPOMATIC_ASSERT (c_context);
Glib::RefPtr<Pango::Context> context = Glib::wrap (c_context);
return Pango::Layout::create (context);
}
}
}
- float const border_width = dcp::BORDER ? (first.outline_width * target.width / 2048.0) : 0;
+ float const border_width = first.effect() == dcp::BORDER ? (first.outline_width * target.width / 2048.0) : 0;
size.width += 2 * ceil (border_width);
size.height += 2 * ceil (border_width);
}
if (first.effect() == dcp::BORDER) {
- /* Border effect; stroke the subtitle with a large (arbitrarily chosen) line width */
+ /* Border effect */
set_source_rgba (context, first.effect_colour(), fade_factor);
context->set_line_width (border_width);
context->set_line_join (Cairo::LINE_JOIN_ROUND);
/* The actual subtitle */
- context->set_line_width (0);
+ set_source_rgba (context, first.colour(), fade_factor);
+
context->move_to (x_offset, y_offset);
-#ifdef DCPOMATIC_HAVE_SHOW_IN_CAIRO_CONTEXT
- layout->show_in_cairo_context (context);
-#else
- pango_cairo_show_layout (context->cobj(), layout->gobj());
-#endif
+ layout->add_to_cairo_context (context);
+ context->fill ();
+
+ context->set_line_width (0.5);
+ context->move_to (x_offset, y_offset);
+ layout->add_to_cairo_context (context);
+ context->stroke ();
int const x = x_position (first, target.width, size.width);
int const y = y_position (first, target.height, size.height);