X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder_stream.h;h=78747bfc5ad713d22faa306281f321ea4fc64af7;hb=f113b2aaca7a65f7b37e12a7d9f3f99e2d834e81;hp=f7ff5fc9652bf75495381c065e02e90d9606d0e8;hpb=4fe27489ad67267081d048b45a4df9ee37541fde;p=dcpomatic.git diff --git a/src/lib/audio_decoder_stream.h b/src/lib/audio_decoder_stream.h index f7ff5fc96..78747bfc5 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 - 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 . */ @@ -34,12 +35,13 @@ class Decoder; class AudioDecoderStream { public: - AudioDecoderStream (boost::shared_ptr, AudioStreamPtr, Decoder* decoder, bool fast, boost::shared_ptr log); + AudioDecoderStream (boost::shared_ptr, AudioStreamPtr, Decoder* decoder, AudioDecoder* audio_decoder, boost::shared_ptr log); ContentAudio get (Frame time, Frame length, bool accurate); void audio (boost::shared_ptr, ContentTime); void flush (); void seek (ContentTime time, bool accurate); + void set_fast (); private: @@ -49,6 +51,7 @@ private: boost::shared_ptr _content; AudioStreamPtr _stream; Decoder* _decoder; + AudioDecoder* _audio_decoder; boost::shared_ptr _log; boost::shared_ptr _resampler; boost::optional _position;