X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_source.cc;h=e61721646b8a4480419aa3ed3b5ca1cc0ddadc70;hb=69efa47dbd1684c897f780c80fd68bdc05c817f4;hp=d77e89367b059de70606d953be86f9ca50dae6ca;hpb=425ef773dbf91d2fecd8e2fbdc20becbfbda46f8;p=dcpomatic.git

diff --git a/src/lib/audio_source.cc b/src/lib/audio_source.cc
index d77e89367..e61721646 100644
--- a/src/lib/audio_source.cc
+++ b/src/lib/audio_source.cc
@@ -21,22 +21,22 @@
 #include "audio_sink.h"
 
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::bind;
 
-void
-AudioSource::connect_audio (shared_ptr<AudioSink> s)
+static void
+process_audio_proxy (weak_ptr<AudioSink> sink, shared_ptr<const AudioBuffers> audio, Time time)
 {
-	Audio.connect (bind (&AudioSink::process_audio, s, _1));
+	shared_ptr<AudioSink> p = sink.lock ();
+	if (p) {
+		p->process_audio (audio, time);
+	}
 }
 
 void
-TimedAudioSource::connect_audio (shared_ptr<TimedAudioSink> s)
+AudioSource::connect_audio (shared_ptr<AudioSink> s)
 {
-	Audio.connect (bind (&TimedAudioSink::process_audio, s, _1, _2));
+	Audio.connect (bind (process_audio_proxy, weak_ptr<AudioSink> (s), _1, _2));
 }
 
-void
-TimedAudioSource::connect_audio (shared_ptr<AudioSink> s)
-{
-	Audio.connect (bind (&AudioSink::process_audio, s, _1));
-}
+