projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split audio; builds.
[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..90269a0f41d132e1f8303fd687926c27dd5ff663 100644
(file)
--- a/
src/lib/audio_decoder_stream.h
+++ b/
src/lib/audio_decoder_stream.h
@@
-22,16
+22,18
@@
#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 AudioDecoderStream
{
public:
class AudioDecoderStream
{
public:
- AudioDecoderStream (boost::shared_ptr<const AudioContent>, AudioStreamPtr, AudioDecoder* decoder);
+ AudioDecoderStream (boost::shared_ptr<const AudioContent>, AudioStreamPtr, AudioDecoder* decoder
, 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);
@@
-46,6
+48,7
@@
private:
boost::shared_ptr<const AudioContent> _content;
AudioStreamPtr _stream;
AudioDecoder* _decoder;
boost::shared_ptr<const AudioContent> _content;
AudioStreamPtr _stream;
AudioDecoder* _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 */