X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.h;h=a8495aaa8b16cdd1090f09923f6f4084bc43ffa0;hb=dba7e1137282b52a1bd6ad1d56fe6371a8c97e30;hp=754321880bcb026c7af361f6ff642eea350ea3f0;hpb=3339d3bce70afe9ae2ca10e9fcfc4b54b748fbf4;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 754321880..a8495aaa8 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -28,9 +28,9 @@
 #define DCPOMATIC_AUDIO_DECODER_H
 
 
-#include "decoder.h"
-#include "content_audio.h"
 #include "audio_stream.h"
+#include "content_audio.h"
+#include "decoder.h"
 #include "decoder_part.h"
 #include <boost/signals2.hpp>
 
@@ -51,9 +51,9 @@ class AudioDecoder : public std::enable_shared_from_this<AudioDecoder>, public D
 public:
 	AudioDecoder (Decoder* parent, std::shared_ptr<const AudioContent> content, bool fast);
 
-	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film> film) const;
+	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film> film) const override;
 	void emit (std::shared_ptr<const Film> film, AudioStreamPtr stream, std::shared_ptr<const AudioBuffers>, dcpomatic::ContentTime, bool time_already_delayed = false);
-	void seek ();
+	void seek () override;
 	void flush ();
 
 	dcpomatic::ContentTime stream_position (std::shared_ptr<const Film> film, AudioStreamPtr stream) const;
@@ -61,7 +61,7 @@ public:
 	boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;
 
 private:
-	void silence (int milliseconds);
+	void silence (AudioStreamPtr stream, int milliseconds);
 
 	std::shared_ptr<const AudioContent> _content;
 	/** Frame after the last one that was emitted from Data (i.e. at the resampled rate, if applicable)