Merge master.

[dcpomatic.git] / src / lib / audio_source.cc

diff --git a/src/lib/audio_source.cc b/src/lib/audio_source.cc
index ccb82334ca01880aca05942bc0eb71786b06df7b..32b3deccfa4a887384d7c834eb1d9d2bcf0c039b 100644 (file)
--- a/src/lib/audio_source.cc
+++ b/src/lib/audio_source.cc
@@ -1,11 +1,52 @@
+/*
+    Copyright (C) 2012 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include "audio_source.h"
 #include "audio_sink.h"
 
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::bind;
 
+static void
+process_audio_proxy (weak_ptr<AudioSink> sink, shared_ptr<const AudioBuffers> audio)
+{
+       shared_ptr<AudioSink> p = sink.lock ();
+       if (p) {
+               p->process_audio (audio);
+       }
+}
+
 void
 AudioSource::connect_audio (shared_ptr<AudioSink> s)
+{
+       Audio.connect (bind (process_audio_proxy, weak_ptr<AudioSink> (s), _1));
+}
+
+void
+TimedAudioSource::connect_audio (shared_ptr<TimedAudioSink> s)
+{
+       Audio.connect (bind (&TimedAudioSink::process_audio, s, _1, _2));
+}
+
+void
+TimedAudioSource::connect_audio (shared_ptr<AudioSink> s)
 {
        Audio.connect (bind (&AudioSink::process_audio, s, _1));
 }