Timestamp audio emissions from butler and hence discard very late

audio in FilmViewer.  This should help with the case where lots
of video frames are rapidly discarded when they are late but the
corresponding audio is not, hence audio buffers get overfilled.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/butler.h b/src/lib/butler.h
index a8b38ef2e..e6553cf8c 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -41,7 +41,7 @@ public:
 
 	void seek (DCPTime position, bool accurate);
 	std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video ();
-	bool get_audio (float* out, Frame frames);
+	boost::optional<DCPTime> get_audio (float* out, Frame frames);
 
 	void disable_audio ();
 
@@ -50,7 +50,7 @@ public:
 private:
 	void thread ();
 	void video (boost::shared_ptr<PlayerVideo> video, DCPTime time);
-	void audio (boost::shared_ptr<AudioBuffers> audio);
+	void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time);
 	bool should_run () const;
 	void prepare (boost::weak_ptr<PlayerVideo> video) const;
 	void player_changed (int);