Merge.

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

diff --git a/src/lib/delay_line.h b/src/lib/delay_line.h
index 377553de4035a1684711092b96f9e4272d97bb3b..4d6f1313bd1e5af24fbaf3ed8b61a13312e754cd 100644 (file)
--- a/src/lib/delay_line.h
+++ b/src/lib/delay_line.h
@@ -17,20 +17,21 @@
 
 */
 
-/** A class which can be fed a stream of bytes and which can
- *  delay them by a positive or negative amount.
- */
-class DelayLine
+#include <boost/shared_ptr.hpp>
+#include "processor.h"
+
+class AudioBuffers;
+
+/** A delay line for audio */
+class DelayLine : public AudioProcessor
 {
 public:
-       DelayLine (int);
-       ~DelayLine ();
+       DelayLine (Log* log, int channels, int frames);
        
-       int feed (uint8_t *, int);
-       void get_remaining (uint8_t *);
+       void process_audio (boost::shared_ptr<AudioBuffers>);
 
 private:
-       int _delay; ///< delay in bytes, +ve to move data later
-       uint8_t* _buffer; ///< buffer for +ve delays, or 0
-       int _negative_delay_remaining; ///< number of bytes of negative delay that remain to emit
+       boost::shared_ptr<AudioBuffers> _buffers;
+       int _negative_delay_remaining; ///< number of frames of negative delay that remain to emit
+       int _frames;
 };