Various more hacks; basically trying to remove Regions as an unnecessary complexity.

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

diff --git a/src/lib/video_source.cc b/src/lib/video_source.cc
index 8101a6d3696d67ca0834e075925ce4e72dff92a6..39043c8601ff35a141b5903013405bf3e7da91d7 100644 (file)
--- a/src/lib/video_source.cc
+++ b/src/lib/video_source.cc
@@ -25,19 +25,20 @@ using boost::weak_ptr;
 using boost::bind;
 
 static void
-process_video_proxy (weak_ptr<VideoSink> sink, shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
+process_video_proxy (weak_ptr<VideoSink> sink, shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub, Time time)
 {
-       boost::shared_ptr<VideoSink> p = sink.lock ();
+       shared_ptr<VideoSink> p = sink.lock ();
        if (p) {
-               p->process_video (i, same, s);
+               p->process_video (image, same, sub, time);
        }
 }
 
 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.
+       /* 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, boost::weak_ptr<VideoSink> (s), _1, _2, _3));
+       Video.connect (bind (process_video_proxy, weak_ptr<VideoSink> (s), _1, _2, _3, _4));
 }
+