X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Frender_subtitles.cc;h=9426427fd507385a12973e0b02823af4c15b19da;hb=837a54744277a5252a1a69b0690305e9a669124d;hp=aa03aefe1eba7c269de9f5471498078316be5fba;hpb=de004ef24e078906f656cbf4cc790bbfe11ea69c;p=dcpomatic.git

diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc
index aa03aefe1..9426427fd 100644
--- a/src/lib/render_subtitles.cc
+++ b/src/lib/render_subtitles.cc
@@ -28,6 +28,9 @@
 #include <fontconfig/fontconfig.h>
 #include <cairomm/cairomm.h>
 #include <pangomm.h>
+#ifndef DCPOMATIC_HAVE_SHOW_IN_CAIRO_CONTEXT
+#include <pango/pangocairo.h>
+#endif
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -46,7 +49,7 @@ static FcConfig* fc_config = 0;
 static list<pair<FontFiles, string> > fc_config_fonts;
 
 string
-marked_up (list<SubtitleString> subtitles, int target_height)
+marked_up (list<SubtitleString> subtitles, int target_height, float fade_factor)
 {
 	string out;
 
@@ -62,6 +65,8 @@ marked_up (list<SubtitleString> subtitles, int target_height)
 			out += "underline=\"single\" ";
 		}
 		out += "size=\"" + dcp::raw_convert<string>(i.size_in_pixels(target_height) * 72 * 1024 / 96) + "\" ";
+		/* Between 1-65535 inclusive, apparently... */
+		out += "alpha=\"" + dcp::raw_convert<string>(int(floor(fade_factor * 65534)) + 1) + "\" ";
 		out += "color=\"#" + i.colour().to_rgb_string() + "\">";
 		out += i.text ();
 		out += "</span>";
@@ -70,6 +75,12 @@ marked_up (list<SubtitleString> subtitles, int target_height)
 	return out;
 }
 
+static void
+set_source_rgba (Cairo::RefPtr<Cairo::Context> context, dcp::Colour colour, float fade_factor)
+{
+	context->set_source_rgba (float(colour.r) / 255, float(colour.g) / 255, float(colour.b) / 255, fade_factor);
+}
+
 /** @param subtitles A list of subtitles that are all on the same line,
  *  at the same time and with the same fade in/out.
  */
@@ -226,12 +237,6 @@ render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp:
 
 	context->set_line_width (1);
 
-	/* Render the subtitle at the top left-hand corner of image */
-
-	Pango::FontDescription font (font_name);
-	layout->set_font_description (font);
-	layout->set_markup (marked_up (subtitles, target.height));
-
 	/* Compute fade factor */
 	float fade_factor = 1;
 
@@ -247,6 +252,12 @@ render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp:
 		fade_factor = 0;
 	}
 
+	/* Render the subtitle at the top left-hand corner of image */
+
+	Pango::FontDescription font (font_name);
+	layout->set_font_description (font);
+	layout->set_markup (marked_up (subtitles, target.height, fade_factor));
+
 	context->scale (xscale, yscale);
 	layout->update_from_cairo_context (context);
 
@@ -254,23 +265,23 @@ render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp:
 	   side of the first character's border is not cut off.
 	*/
 	int const x_offset = subtitles.front().effect() == dcp::BORDER ? (target.width / 600.0) : 0;
+	/* Move down a bit so that accents on capital letters can be seen */
+	int const y_offset = target.height / 100.0;
 
 	if (subtitles.front().effect() == dcp::SHADOW) {
 		/* Drop-shadow effect */
-		dcp::Colour const ec = subtitles.front().effect_colour ();
-		context->set_source_rgba (float(ec.r) / 255, float(ec.g) / 255, float(ec.b) / 255, fade_factor);
-		context->move_to (x_offset + 4, 4);
+		set_source_rgba (context, subtitles.front().effect_colour(), fade_factor);
+		context->move_to (x_offset + 4, y_offset + 4);
 		layout->add_to_cairo_context (context);
 		context->fill ();
 	}
 
 	if (subtitles.front().effect() == dcp::BORDER) {
 		/* Border effect; stroke the subtitle with a large (arbitrarily chosen) line width */
-		dcp::Colour ec = subtitles.front().effect_colour ();
-		context->set_source_rgba (float(ec.r) / 255, float(ec.g) / 255, float(ec.b) / 255, fade_factor);
+		set_source_rgba (context, subtitles.front().effect_colour(), fade_factor);
 		context->set_line_width (subtitles.front().outline_width * target.width / 2048.0);
 		context->set_line_join (Cairo::LINE_JOIN_ROUND);
-		context->move_to (x_offset, 0);
+		context->move_to (x_offset, y_offset);
 		layout->add_to_cairo_context (context);
 		context->stroke ();
 	}
@@ -278,8 +289,12 @@ render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp:
 	/* The actual subtitle */
 
 	context->set_line_width (0);
-	context->move_to (x_offset, 0);
+	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
 
 	int layout_width;
 	int layout_height;