projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix crash on new film.
[dcpomatic.git]
/
src
/
lib
/
audio_decoder.h
diff --git
a/src/lib/audio_decoder.h
b/src/lib/audio_decoder.h
index 24e2796aeac07badddd987d97074a7c8faf037c5..c393e95f12b776f3b93172a4539159c6b78fa8a2 100644
(file)
--- a/
src/lib/audio_decoder.h
+++ b/
src/lib/audio_decoder.h
@@
-21,8
+21,8
@@
* @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 "decoder.h"
#include "audio_source.h"
#include "decoder.h"
@@
-32,7
+32,7
@@
class AudioContent;
/** @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
Timed
AudioSource, public virtual Decoder
{
public:
AudioDecoder (boost::shared_ptr<const Film>);
{
public:
AudioDecoder (boost::shared_ptr<const Film>);