Remove uses of boost::system::error_code::message(), which seem to cause the pure...

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

diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 6ad33fb37c898ad267083854fad35ecd3fcf961a..f068b504e8dcbff0c0215a146de00550480bea97 100644 (file)
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -37,6 +37,8 @@ public:
        TimedAudioBuffers<T>
        pull (T time)
        {
+               assert (time >= _last_pull);
+               
                TimedAudioBuffers<T> out;
                
                F const to_return = _t_to_f (time - _last_pull);
@@ -102,7 +104,7 @@ public:
        }
 
        void
-       clear (Time t)
+       clear (DCPTime t)
        {
                _last_pull = t;
                _buffers.reset (new AudioBuffers (_buffers->channels(), 0));