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 99b59759d07eac7250126429515f7c00863f9677..32b3deccfa4a887384d7c834eb1d9d2bcf0c039b 100644 (file)
--- 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) {
@@ -38,3 +38,15 @@ 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));
+}