X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsilence_decoder.cc;h=8cff80ed2a950ae6a9c36eab2c1039bc8657d624;hb=d0d584a7dde6de383302615634fdee17e9724fe8;hp=e787262f5054510e6b4117ee96e6e8a5691b53ae;hpb=a0f1a3d40f1c93d4432d1d4857c1620907259b2f;p=dcpomatic.git

diff --git a/src/lib/silence_decoder.cc b/src/lib/silence_decoder.cc
index e787262f5..8cff80ed2 100644
--- a/src/lib/silence_decoder.cc
+++ b/src/lib/silence_decoder.cc
@@ -22,11 +22,13 @@
 #include "audio_buffers.h"
 
 using std::min;
+using std::cout;
 using boost::shared_ptr;
 
 SilenceDecoder::SilenceDecoder (shared_ptr<const Film> f, shared_ptr<NullContent> c)
 	: Decoder (f)
-	, AudioDecoder (f, c)
+	, AudioDecoder (f)
+	, _null_content (c)
 {
 	
 }
@@ -36,43 +38,15 @@ SilenceDecoder::pass ()
 {
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
-	
-	Time const this_time = min (_audio_content->length() - _next_audio, TIME_HZ / 2);
-	shared_ptr<AudioBuffers> data (new AudioBuffers (MAX_AUDIO_CHANNELS, film->time_to_audio_frames (this_time)));
-	data->make_silent ();
-	audio (data, _next_audio);
-}
-
-void
-SilenceDecoder::seek (Time t)
-{
-	_next_audio = t;
-}
-
-void
-SilenceDecoder::seek_back ()
-{
-	boost::shared_ptr<const Film> f = _film.lock ();
-	if (!f) {
-		return;
-	}
-
-	_next_audio -= f->video_frames_to_time (2);
-}
 
-void
-SilenceDecoder::seek_forward ()
-{
-	boost::shared_ptr<const Film> f = _film.lock ();
-	if (!f) {
-		return;
-	}
-
-	_next_audio += f->video_frames_to_time (1);
+	AudioContent::Frame const this_time = min (_null_content->audio_length() - _next_audio_frame, int64_t (_null_content->output_audio_frame_rate() / 2));
+	shared_ptr<AudioBuffers> data (new AudioBuffers (film->dcp_audio_channels(), this_time));
+	data->make_silent ();
+	audio (data, _next_audio_frame);
 }
 
-Time
-SilenceDecoder::next () const
+bool
+SilenceDecoder::done () const
 {
-	return _next_audio;
+	return _next_audio_frame > _null_content->audio_length ();
 }