projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
lib
/
audio_decoder_stream.h
diff --git
a/src/lib/audio_decoder_stream.h
b/src/lib/audio_decoder_stream.h
index 5c772e4f7cc9423ed172e0fe51f53e7b4acbd781..939a7d08b1a2f066800e041d4beb24b3a2a45d2b 100644
(file)
--- 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>
/*
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.
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
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 "audio_stream.h"
#include "content_audio.h"
+#include "dcpomatic_time.h"
#include <boost/shared_ptr.hpp>
class AudioContent;
class AudioDecoder;
class Resampler;
#include <boost/shared_ptr.hpp>
class AudioContent;
class AudioDecoder;
class Resampler;
+class Log;
+class Decoder;
class AudioDecoderStream
{
public:
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);
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;
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 */
boost::shared_ptr<Resampler> _resampler;
boost::optional<Frame> _position;
/** Currently-available decoded audio data */