From 4122f932b1dc25f7a4592f49f2c9ab19d63b3a4e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 11 Jul 2013 15:50:18 +0100
Subject: Add test for audio delay, and do it in the player rather than the
 decoder.

---
 src/lib/audio_decoder.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/lib/audio_decoder.cc')

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 2fe347cf2..3b97cc16f 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -35,17 +35,12 @@ AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<const AudioCont
 	: 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;
-	}
 }
-- 
cgit v1.2.3