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 495d20533b3eb15947f8a199b34901700d07b5f3..d5098fed7c455bcb900b0b59d4d3a499ac770cba 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -71,7 +71,6 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
        : _film (f)
        , _playlist (p)
        , _have_valid_pieces (false)
-       , _approximate_size (false)
        , _ignore_video (false)
 {
        _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
@@ -295,12 +294,6 @@ Player::transform_image_subtitles (list<ImageSubtitle> subs) const
        return all;
 }
 
-void
-Player::set_approximate_size ()
-{
-       _approximate_size = true;
-}
-
 shared_ptr<PlayerVideo>
 Player::black_player_video_frame (DCPTime time) const
 {
@@ -314,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
                )
        );
 }
@@ -352,7 +345,7 @@ Player::get_video (DCPTime time, bool accurate)
                        return pvf;
                }
                
-               dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size (), _approximate_size ? 4 : 1);
+               dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size ());
 
                for (list<ContentVideo>::const_iterator i = content_video.begin(); i != content_video.end(); ++i) {
                        pvf.push_back (
@@ -383,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));