Merge master.

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

diff --git a/src/lib/video_source.cc b/src/lib/video_source.cc
index af6f941fd1f3f00a2b6ea2055e879bd75ddbf337..4d505f9fea647687c48396235b1bc0dae520a86c 100644 (file)
--- a/src/lib/video_source.cc
+++ b/src/lib/video_source.cc
@@ -21,16 +21,44 @@
 #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)
 {
-       Video.connect (bind (&VideoSink::process_video, s, _1, _2, _3));
+       /* If we bind, say, a Player (as the VideoSink) to a Decoder (which is owned
+          by the Player) we create a cycle.  Use a weak_ptr to break it.
+       */
+       Video.connect (bind (process_video_proxy, weak_ptr<VideoSink> (s), _1, _2, _3));
+}
+
+void
+TimedVideoSource::connect_video (shared_ptr<VideoSink> s)
+{
+       Video.connect (bind (process_video_proxy, weak_ptr<VideoSink> (s), _1, _2, _3));
+}
+
+static void
+timed_process_video_proxy (weak_ptr<TimedVideoSink> sink, shared_ptr<const Image> i, bool same, shared_ptr<Subtitle> s, double t)
+{
+       shared_ptr<TimedVideoSink> p = sink.lock ();
+       if (p) {
+               p->process_video (i, same, s, t);
+       }
 }
 
 void
 TimedVideoSource::connect_video (shared_ptr<TimedVideoSink> s)
 {
-       Video.connect (bind (&TimedVideoSink::process_video, s, _1, _2, _3, _4));
+       Video.connect (bind (timed_process_video_proxy, weak_ptr<TimedVideoSink> (s), _1, _2, _3, _4));
 }