Untested audio delay.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index ade11cc32..2fe347cf2 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -31,15 +31,21 @@ using std::cout;
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const Film> f)
+AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<const AudioContent> c)
 	: Decoder (f)
 	, _audio_position (0)
 {
+	_delay_frames = c->audio_delay() * c->content_audio_frame_rate() * f->dcp_audio_frame_rate() / (c->output_audio_frame_rate() * 1000);
 }
 
 void
 AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame)
 {
+	frame += _delay_frames;
+	
 	Audio (data, frame);
 	_audio_position = frame + data->frames ();
+	if (_audio_position < 0) {
+		_audio_position = 0;
+	}
 }