projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add word_wrap().
[dcpomatic.git]
/
src
/
lib
/
content_audio.h
diff --git
a/src/lib/content_audio.h
b/src/lib/content_audio.h
index 509e7e4a6c92f326536637238db75bebb2081f14..074d6b42843869b6cb44e5bb207739e7918e95f2 100644
(file)
--- a/
src/lib/content_audio.h
+++ b/
src/lib/content_audio.h
@@
-18,34
+18,34
@@
*/
*/
+
#ifndef DCPOMATIC_CONTENT_AUDIO_H
#define DCPOMATIC_CONTENT_AUDIO_H
#ifndef DCPOMATIC_CONTENT_AUDIO_H
#define DCPOMATIC_CONTENT_AUDIO_H
+
/** @file src/lib/content_audio.h
* @brief ContentAudio class.
*/
/** @file src/lib/content_audio.h
* @brief ContentAudio class.
*/
+
#include "audio_buffers.h"
#include "types.h"
#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
{
public:
/** @class ContentAudio
* @brief A block of audio from a piece of content, with a timestamp as a frame within that content.
*/
class ContentAudio
{
public:
- ContentAudio ()
- : audio (new AudioBuffers (0, 0))
- , frame (0)
- {}
-
- ContentAudio (boost::shared_ptr<const AudioBuffers> a, Frame f)
+ ContentAudio (std::shared_ptr<const AudioBuffers> a, Frame f)
: audio (a)
, frame (f)
{}
: audio (a)
, frame (f)
{}
-
boost
::shared_ptr<const AudioBuffers> audio;
+
std
::shared_ptr<const AudioBuffers> audio;
Frame frame;
};
Frame frame;
};
+
#endif
#endif