Merge master; fix crash on new film.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/lib/audio_source.cc b/src/lib/audio_source.cc
index 3dd3027ab..32b3deccf 100644
--- a/src/lib/audio_source.cc
+++ b/src/lib/audio_source.cc
@@ -25,7 +25,7 @@ using boost::weak_ptr;
 using boost::bind;
 
 static void
-process_audio_proxy (weak_ptr<AudioSink> sink, shared_ptr<AudioBuffers> audio)
+process_audio_proxy (weak_ptr<AudioSink> sink, shared_ptr<const AudioBuffers> audio)
 {
 	shared_ptr<AudioSink> p = sink.lock ();
 	if (p) {
@@ -44,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));
+}