X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_source.cc;h=e61721646b8a4480419aa3ed3b5ca1cc0ddadc70;hb=01791aac0b11e9f296cd31a7803e287203bd8355;hp=bca3562cf974f36ea45077b1a08ed01142ea79a2;hpb=63ec6f067fb6de3f65a03237fabb4f687cf74d4b;p=dcpomatic.git diff --git a/src/lib/audio_source.cc b/src/lib/audio_source.cc index bca3562cf..e61721646 100644 --- a/src/lib/audio_source.cc +++ b/src/lib/audio_source.cc @@ -21,16 +21,22 @@ #include "audio_sink.h" using boost::shared_ptr; +using boost::weak_ptr; using boost::bind; -void -AudioSource::connect_audio (shared_ptr s) +static void +process_audio_proxy (weak_ptr sink, shared_ptr audio, Time time) { - Audio.connect (bind (&AudioSink::process_audio, s, _1)); + shared_ptr p = sink.lock (); + if (p) { + p->process_audio (audio, time); + } } void -TimedAudioSource::connect_audio (shared_ptr s) +AudioSource::connect_audio (shared_ptr s) { - Audio.connect (bind (&TimedAudioSink::process_audio, s, _1, _2)); + Audio.connect (bind (process_audio_proxy, weak_ptr (s), _1, _2)); } + +