Start of changing frame numbers to time.

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

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 2fe347cf2a50af794fbd261ad9587d31ed35b574..a73ad4d7c4c2e510b129937fa47b7eba9bdf7595 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -21,6 +21,7 @@
 #include "audio_buffers.h"
 #include "exceptions.h"
 #include "log.h"
+#include "resampler.h"
 
 #include "i18n.h"
 
@@ -31,21 +32,25 @@ using std::cout;
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<const AudioContent> c)
-       : Decoder (f)
-       , _audio_position (0)
+AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioContent> content)
+       : Decoder (film)
+       , _audio_content (content)
 {
-       _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)
+AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
+{
+       Audio (data, time);
+}
+
+/** This is a bit odd, but necessary when we have (e.g.) FFmpegDecoders with no audio.
+ *  The player needs to know that there is no audio otherwise it will keep trying to
+ *  pass() the decoder to get it to emit audio.
+ */
+bool
+AudioDecoder::has_audio () const
 {
-       frame += _delay_frames;
-       
-       Audio (data, frame);
-       _audio_position = frame + data->frames ();
-       if (_audio_position < 0) {
-               _audio_position = 0;
-       }
+       return _audio_content->audio_channels () > 0;
 }