X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Faudio_merger.h;h=c9026b93eb99aedf131f0e68db54b148c839ee9f;hb=eb135e8dcdf36ae82420bcd18e954ad593b3e9a5;hp=756e5ab3120719fc8fd4e892891b947bbdf31ddb;hpb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;p=dcpomatic.git

diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 756e5ab31..c9026b93e 100644
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,10 +17,10 @@
 
 */
 
+#include "audio_buffers.h"
+#include "dcpomatic_time.h"
 #include "util.h"
 
-class AudioBuffers;
-
 class AudioMerger
 {
 public:
@@ -29,13 +29,11 @@ public:
 	/** Pull audio up to a given time; after this call, no more data can be pushed
 	 *  before the specified time.
 	 */
-	TimedAudioBuffers pull (DCPTime time);
+	std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> pull (DCPTime time);
 	void push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time);
-	TimedAudioBuffers flush ();
-	void clear (DCPTime t);
-	
+
 private:
 	boost::shared_ptr<AudioBuffers> _buffers;
-	int _frame_rate;
 	DCPTime _last_pull;
+	int _frame_rate;
 };