Basic adaptations for changes to libdcp1 colour conversion handling.

[dcpomatic.git] / src / lib / render_subtitles.cc

diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc
index 5364b8dfe3eeb9a3e0f0c1655c2b1ff4a425ca3a..b2900d27a8dfdc3e99f0f5fd289b45beb3b56c8e 100644 (file)
--- a/src/lib/render_subtitles.cc
+++ b/src/lib/render_subtitles.cc
@@ -37,11 +37,11 @@ calculate_position (dcp::VAlign v_align, double v_position, int target_height, i
 {
        switch (v_align) {
        case dcp::TOP:
-               return (v_position / 100) * target_height - offset;
+               return v_position * target_height - offset;
        case dcp::CENTER:
-               return (0.5 + v_position / 100) * target_height - offset;
+               return (0.5 + v_position) * target_height - offset;
        case dcp::BOTTOM:
-               return (1.0 - v_position / 100) * target_height - offset;
+               return (1.0 - v_position) * target_height - offset;
        }
 
        return 0;
@@ -88,11 +88,7 @@ render_subtitles (list<dcp::SubtitleString> subtitles, dcp::Size target)
        context->set_line_width (1);
 
        for (list<dcp::SubtitleString>::const_iterator i = subtitles.begin(); i != subtitles.end(); ++i) {
-               string f = i->font ();
-               if (f.empty ()) {
-                       f = "Arial";
-               }
-               Pango::FontDescription font (f);
+               Pango::FontDescription font (i->font().get_value_or ("Arial"));
                font.set_absolute_size (i->size_in_pixels (target.height) * PANGO_SCALE);
                if (i->italic ()) {
                        font.set_style (Pango::STYLE_ITALIC);