X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder_stream.h;h=939a7d08b1a2f066800e041d4beb24b3a2a45d2b;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=5c772e4f7cc9423ed172e0fe51f53e7b4acbd781;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/lib/audio_decoder_stream.h b/src/lib/audio_decoder_stream.h
index 5c772e4f7..939a7d08b 100644
--- a/src/lib/audio_decoder_stream.h
+++ b/src/lib/audio_decoder_stream.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -22,16 +23,19 @@
 
 #include "audio_stream.h"
 #include "content_audio.h"
+#include "dcpomatic_time.h"
 #include <boost/shared_ptr.hpp>
 
 class AudioContent;
 class AudioDecoder;
 class Resampler;
+class Log;
+class Decoder;
 
 class AudioDecoderStream
 {
 public:
-	AudioDecoderStream (boost::shared_ptr<const AudioContent>, AudioStreamPtr, AudioDecoder* decoder);
+	AudioDecoderStream (boost::shared_ptr<const AudioContent>, AudioStreamPtr, Decoder* decoder, bool fast, boost::shared_ptr<Log> log);
 
 	ContentAudio get (Frame time, Frame length, bool accurate);
 	void audio (boost::shared_ptr<const AudioBuffers>, ContentTime);
@@ -45,7 +49,8 @@ private:
 
 	boost::shared_ptr<const AudioContent> _content;
 	AudioStreamPtr _stream;
-	AudioDecoder* _decoder;
+	Decoder* _decoder;
+	boost::shared_ptr<Log> _log;
 	boost::shared_ptr<Resampler> _resampler;
 	boost::optional<Frame> _position;
 	/** Currently-available decoded audio data */