Merge master; fix crash on new film.

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

diff --git a/src/lib/audio_source.cc b/src/lib/audio_source.cc
index bca3562cf974f36ea45077b1a08ed01142ea79a2..32b3deccfa4a887384d7c834eb1d9d2bcf0c039b 100644 (file)
--- a/src/lib/audio_source.cc
+++ b/src/lib/audio_source.cc
@@ -21,12 +21,22 @@
 #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 (&AudioSink::process_audio, s, _1));
+       Audio.connect (bind (process_audio_proxy, weak_ptr<AudioSink> (s), _1));
 }
 
 void
@@ -34,3 +44,9 @@ 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));
+}