Fix audio weirdness when start-trimming.

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 5c047d0eb5ecad5b2c34ed3cd313a55b5e0502e4..8370a3f9fa4373fc957238cf7d7fd3c88d93c0e9 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -336,7 +336,7 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
                return;
        }
 
-       Time time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time;
+       Time time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time - content->trim_start ();
        
        /* Remap channels */
        shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->frames()));
@@ -574,7 +574,7 @@ Player::emit_black ()
 #ifdef DCPOMATIC_DEBUG
        _last_video.reset ();
 #endif
-       
+
        Video (_black_frame, EYES_BOTH, ColourConversion(), _last_emit_was_black, _video_position);
        _video_position += _film->video_frames_to_time (1);
        _last_emit_was_black = true;