d588620e70bf15da29cc242e4ae8d86977e8f36a from master; fix hang if you cancel a paused...

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

diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc
index 4ff28df6a7548cbcd4326e3e12ee9bcaf9e23db2..9620eacbf5c58ebe4a3dc847262067c6802ea54e 100644 (file)
--- a/src/lib/render_subtitles.cc
+++ b/src/lib/render_subtitles.cc
@@ -50,10 +50,6 @@ calculate_position (dcp::VAlign v_align, double v_position, int target_height, i
 PositionImage
 render_subtitles (list<dcp::SubtitleString> subtitles, dcp::Size target)
 {
-       if (subtitles.empty ()) {
-               return PositionImage ();
-       }
-
        /* Estimate height that the subtitle image needs to be */
        optional<int> top;
        optional<int> bottom;
@@ -99,16 +95,6 @@ render_subtitles (list<dcp::SubtitleString> subtitles, dcp::Size target)
                /* Compute fade factor */
                /* XXX */
                float fade_factor = 1;
-#if 0          
-               dcp::Time now (time * 1000 / (4 * TIME_HZ));
-               dcp::Time end_fade_up = i->in() + i->fade_up_time ();
-               dcp::Time start_fade_down = i->out() - i->fade_down_time ();
-               if (now < end_fade_up) {
-                       fade_factor = (now - i->in()) / i->fade_up_time();
-               } else if (now > start_fade_down) {
-                       fade_factor = 1.0 - ((now - start_fade_down) / i->fade_down_time ());
-               }
-#endif         
 
                layout->update_from_cairo_context (context);