Copy DCP name layout fix from master.

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 436ae3fe88fb33adaee5aacb1c2f3cfd99799b7f..d5098fed7c455bcb900b0b59d4d3a499ac770cba 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -307,7 +307,7 @@ Player::black_player_video_frame (DCPTime time) const
                        _video_container_size,
                        EYES_BOTH,
                        PART_WHOLE,
-                       Config::instance()->colour_conversions().front().conversion
+                       PresetColourConversion::all().front().conversion
                )
        );
 }
@@ -376,9 +376,11 @@ Player::get_video (DCPTime time, bool accurate)
        list<PositionImage> c = transform_image_subtitles (ps.image);
        copy (c.begin(), c.end(), back_inserter (sub_images));
 
-       /* Text subtitles (rendered to images) */
-       sub_images.push_back (render_subtitles (ps.text, _video_container_size));
-       
+       /* Text subtitles (rendered to an image) */
+       if (!ps.text.empty ()) {
+               sub_images.push_back (render_subtitles (ps.text, _video_container_size));
+       }
+
        if (!sub_images.empty ()) {
                for (list<shared_ptr<PlayerVideo> >::const_iterator i = pvf.begin(); i != pvf.end(); ++i) {
                        (*i)->set_subtitle (merge (sub_images));