Adjust AudioMerger to non-signalling API.

[dcpomatic.git] / src / lib / types.h

diff --git a/src/lib/types.h b/src/lib/types.h
index d6136fc3e2778d08dbbba65392827e704a2c3bc3..e1487ed4d708c07925f4978bafedc85a0035e0c4 100644 (file)
--- 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,