summaryrefslogtreecommitdiff
path: root/src/lib/audio_merger.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/audio_merger.h')
-rw-r--r--src/lib/audio_merger.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 121b21095..756e5ab31 100644
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -29,9 +29,9 @@ public:
/** Pull audio up to a given time; after this call, no more data can be pushed
* before the specified time.
*/
- TimedAudioBuffers<DCPTime> pull (DCPTime time);
+ TimedAudioBuffers pull (DCPTime time);
void push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time);
- TimedAudioBuffers<DCPTime> flush ();
+ TimedAudioBuffers flush ();
void clear (DCPTime t);
private: