X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_source.cc;h=2de4db68d75657a55a2a05f49a0a86914781f908;hb=f861018389acd9d277fe34d7621182b9b54f977f;hp=56742e2b4729a988680ee50bf5536e8682fbba16;hpb=a00ebbc68438e84076c65e99d0e70403afb4407d;p=dcpomatic.git

diff --git a/src/lib/video_source.cc b/src/lib/video_source.cc
index 56742e2b4..2de4db68d 100644
--- a/src/lib/video_source.cc
+++ b/src/lib/video_source.cc
@@ -21,10 +21,37 @@
 #include "video_sink.h"
 
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::bind;
 
+static void
+process_video_proxy (weak_ptr<VideoSink> sink, shared_ptr<const Image> i, bool same, shared_ptr<Subtitle> s)
+{
+	shared_ptr<VideoSink> p = sink.lock ();
+	if (p) {
+		p->process_video (i, same, s);
+	}
+}
+
 void
 VideoSource::connect_video (shared_ptr<VideoSink> s)
+{
+	/* If we bind, say, a Playlist (as the VideoSink) to a Decoder (which is owned
+	   by the Playlist) we create a cycle.  Use a weak_ptr to break it.
+	*/
+	Video.connect (bind (process_video_proxy, boost::weak_ptr<VideoSink> (s), _1, _2, _3));
+}
+
+void
+TimedVideoSource::connect_video (shared_ptr<TimedVideoSink> s)
+{
+	Video.connect (bind (&TimedVideoSink::process_video, s, _1, _2, _3, _4));
+}
+
+void
+TimedVideoSource::connect_video (shared_ptr<VideoSink> s)
 {
 	Video.connect (bind (&VideoSink::process_video, s, _1, _2, _3));
 }
+
+