diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-27 21:10:45 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-27 21:10:45 +0100 |
| commit | bcb746a19d5cc5377eacb33b73b59549a7372487 (patch) | |
| tree | 119fcf92cdf8e294e44dbf7d8dee240141d2ec00 /src/lib/types.h | |
| parent | 2777ab63db3d190a5bc0ea238541558e87ea9b47 (diff) | |
Adjust AudioMerger to non-signalling API.
Diffstat (limited to 'src/lib/types.h')
| -rw-r--r-- | src/lib/types.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/lib/types.h b/src/lib/types.h index d6136fc3e..e1487ed4d 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -26,6 +26,7 @@ #include <libdcp/util.h> class Content; +class AudioBuffers; typedef int64_t Time; #define TIME_MAX INT64_MAX @@ -34,6 +35,22 @@ typedef int64_t OutputAudioFrame; typedef int OutputVideoFrame; typedef std::vector<boost::shared_ptr<Content> > ContentList; +template<class T> +struct TimedAudioBuffers +{ + TimedAudioBuffers () + : time (0) + {} + + TimedAudioBuffers (boost::shared_ptr<AudioBuffers> a, T t) + : audio (a) + , time (t) + {} + + boost::shared_ptr<AudioBuffers> audio; + T time; +}; + enum VideoFrameType { VIDEO_FRAME_TYPE_2D, |