projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untested audio delay.
[dcpomatic.git]
/
src
/
lib
/
audio_decoder.h
diff --git
a/src/lib/audio_decoder.h
b/src/lib/audio_decoder.h
index 3bf585f4de1f77259de867f218d66fa6fe4fe141..a7849b9cc93a180110a4b7e902ecb08572369d2f 100644
(file)
--- a/
src/lib/audio_decoder.h
+++ b/
src/lib/audio_decoder.h
@@
-21,38
+21,32
@@
* @brief Parent class for audio decoders.
*/
* @brief Parent class for audio decoders.
*/
-#ifndef D
VD
OMATIC_AUDIO_DECODER_H
-#define D
VD
OMATIC_AUDIO_DECODER_H
+#ifndef D
CP
OMATIC_AUDIO_DECODER_H
+#define D
CP
OMATIC_AUDIO_DECODER_H
-#include "audio_source.h"
-#include "stream.h"
#include "decoder.h"
#include "decoder.h"
+#include "content.h"
+
+class AudioBuffers;
/** @class AudioDecoder.
* @brief Parent class for audio decoders.
*/
/** @class AudioDecoder.
* @brief Parent class for audio decoders.
*/
-class AudioDecoder : public
AudioSource, public
virtual Decoder
+class AudioDecoder : public virtual Decoder
{
public:
{
public:
- AudioDecoder (boost::shared_ptr<
Film>, DecodeOptions, Job *
);
+ AudioDecoder (boost::shared_ptr<
const Film>, boost::shared_ptr<const AudioContent>
);
- virtual void set_audio_stream (boost::shared_ptr<AudioStream>);
+ /** Emitted when some audio data is ready */
+ boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame)> Audio;
- /** @return Audio stream that we are using */
- boost::shared_ptr<AudioStream> audio_stream () const {
- return _audio_stream;
- }
+protected:
- /** @return All available audio streams */
- std::vector<boost::shared_ptr<AudioStream> > audio_streams () const {
- return _audio_streams;
- }
+ void audio (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+ AudioContent::Frame _audio_position;
-protected:
- /** Audio stream that we are using */
- boost::shared_ptr<AudioStream> _audio_stream;
- /** All available audio streams */
- std::vector<boost::shared_ptr<AudioStream> > _audio_streams;
+private:
+ AudioContent::Frame _delay_frames;
};
#endif
};
#endif