projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix crash on new film.
[dcpomatic.git]
/
src
/
lib
/
video_source.cc
diff --git
a/src/lib/video_source.cc
b/src/lib/video_source.cc
index ccb76f02018a45268ed74d22d1d3b344b53cfea5..2de4db68d75657a55a2a05f49a0a86914781f908 100644
(file)
--- a/
src/lib/video_source.cc
+++ b/
src/lib/video_source.cc
@@
-25,7
+25,7
@@
using boost::weak_ptr;
using boost::bind;
static void
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> i, bool same, shared_ptr<Subtitle> s)
{
shared_ptr<VideoSink> p = sink.lock ();
if (p) {
{
shared_ptr<VideoSink> p = sink.lock ();
if (p) {
@@
-47,3
+47,11
@@
TimedVideoSource::connect_video (shared_ptr<TimedVideoSink> s)
{
Video.connect (bind (&TimedVideoSink::process_video, s, _1, _2, _3, _4));
}
{
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));
+}
+
+