From 3f2365fcf3a1ffc50901eb2e4af246aa4c83e272 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 15 Apr 2013 16:24:03 +0100
Subject: Repair very bad merge.  Mysterious.

---
 src/lib/audio_source.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/lib/audio_source.h')

diff --git a/src/lib/audio_source.h b/src/lib/audio_source.h
index 5a1510d3c..3dc998cca 100644
--- a/src/lib/audio_source.h
+++ b/src/lib/audio_source.h
@@ -28,6 +28,7 @@
 
 class AudioBuffers;
 class AudioSink;
+class TimedAudioSink;
 
 /** A class that emits audio data */
 class AudioSource
@@ -39,4 +40,15 @@ public:
 	void connect_audio (boost::shared_ptr<AudioSink>);
 };
 
+
+/** A class that emits audio data with timestamps */
+class TimedAudioSource
+{
+public:
+	/** Emitted when some audio data is ready */
+	boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, double)> Audio;
+
+	void connect_audio (boost::shared_ptr<TimedAudioSink>);
+};
+
 #endif
-- 
cgit v1.2.3