projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Logging improvements to allow prettier displays in the server GUI.
[dcpomatic.git]
/
src
/
lib
/
content_audio.h
diff --git
a/src/lib/content_audio.h
b/src/lib/content_audio.h
index 535c0b4913c7c0a2c157a94c40aeb69101620d6b..c343865e39fa1d586f2df2af03ee84ee5e6d6703 100644
(file)
--- a/
src/lib/content_audio.h
+++ b/
src/lib/content_audio.h
@@
-17,11
+17,15
@@
*/
*/
+#ifndef DCPOMATIC_CONTENT_AUDIO_H
+#define DCPOMATIC_CONTENT_AUDIO_H
+
/** @file src/lib/content_audio.h
* @brief ContentAudio class.
*/
#include "audio_buffers.h"
/** @file src/lib/content_audio.h
* @brief ContentAudio class.
*/
#include "audio_buffers.h"
+#include "types.h"
/** @class ContentAudio
* @brief A block of audio from a piece of content, with a timestamp as a frame within that content.
/** @class ContentAudio
* @brief A block of audio from a piece of content, with a timestamp as a frame within that content.
@@
-33,12
+37,14
@@
public:
: audio (new AudioBuffers (0, 0))
, frame (0)
{}
: audio (new AudioBuffers (0, 0))
, frame (0)
{}
-
- ContentAudio (boost::shared_ptr<AudioBuffers> a,
Audio
Frame f)
+
+ ContentAudio (boost::shared_ptr<AudioBuffers> a, Frame f)
: audio (a)
, frame (f)
{}
boost::shared_ptr<AudioBuffers> audio;
: audio (a)
, frame (f)
{}
boost::shared_ptr<AudioBuffers> audio;
-
Audio
Frame frame;
+ Frame frame;
};
};
+
+#endif