More seek tidying.

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 7ab72d9a15379b7c71fade6ba432cdb686b77546..8532b5417b588bfbe9c26f0b4d630570607b880f 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -232,7 +232,7 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
        if (image_size != _video_container_size) {
                assert (image_size.width <= _video_container_size.width);
                assert (image_size.height <= _video_container_size.height);
-               shared_ptr<Image> im (new SimpleImage (PIX_FMT_RGB24, _video_container_size, true));
+               shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
                im->make_black ();
                im->copy (work_image, Position<int> ((_video_container_size.width - image_size.width) / 2, (_video_container_size.height - image_size.height) / 2));
                work_image = im;
@@ -271,7 +271,9 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
        dcp_mapped->make_silent ();
        list<pair<int, libdcp::Channel> > map = content->audio_mapping().content_to_dcp ();
        for (list<pair<int, libdcp::Channel> >::iterator i = map.begin(); i != map.end(); ++i) {
-               dcp_mapped->accumulate_channel (audio.get(), i->first, i->second);
+               if (i->first < audio->channels() && i->second < dcp_mapped->channels()) {
+                       dcp_mapped->accumulate_channel (audio.get(), i->first, i->second);
+               }
        }
 
        audio = dcp_mapped;
@@ -480,7 +482,7 @@ void
 Player::set_video_container_size (libdcp::Size s)
 {
        _video_container_size = s;
-       _black_frame.reset (new SimpleImage (PIX_FMT_RGB24, _video_container_size, true));
+       _black_frame.reset (new Image (PIX_FMT_RGB24, _video_container_size, true));
        _black_frame->make_black ();
 }