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.h
diff --git
a/src/lib/video_source.h
b/src/lib/video_source.h
index 705b0023aec3037877a60e5e7af16db1a854d97e..9b4c9b4a2040db794a94b179da4e2c46dcdb7dc8 100644
(file)
--- a/
src/lib/video_source.h
+++ b/
src/lib/video_source.h
@@
-21,8
+21,8
@@
* @brief Parent class for classes which emit video data.
*/
* @brief Parent class for classes which emit video data.
*/
-#ifndef D
VD
OMATIC_VIDEO_SOURCE_H
-#define D
VD
OMATIC_VIDEO_SOURCE_H
+#ifndef D
CP
OMATIC_VIDEO_SOURCE_H
+#define D
CP
OMATIC_VIDEO_SOURCE_H
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
@@
-45,7
+45,7
@@
public:
* Second parameter is true if the image is the same as the last one that was emitted.
* Third parameter is either 0 or a subtitle that should be on this frame.
*/
* Second parameter is true if the image is the same as the last one that was emitted.
* Third parameter is either 0 or a subtitle that should be on this frame.
*/
- boost::signals2::signal<void (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>)> Video;
+ boost::signals2::signal<void (boost::shared_ptr<
const
Image>, bool, boost::shared_ptr<Subtitle>)> Video;
void connect_video (boost::shared_ptr<VideoSink>);
};
void connect_video (boost::shared_ptr<VideoSink>);
};
@@
-63,8
+63,9
@@
public:
* Third parameter is either 0 or a subtitle that should be on this frame.
* Fourth parameter is the source timestamp of this frame.
*/
* Third parameter is either 0 or a subtitle that should be on this frame.
* Fourth parameter is the source timestamp of this frame.
*/
- boost::signals2::signal<void (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double)> Video;
+ boost::signals2::signal<void (boost::shared_ptr<
const
Image>, bool, boost::shared_ptr<Subtitle>, double)> Video;
+ void connect_video (boost::shared_ptr<VideoSink>);
void connect_video (boost::shared_ptr<TimedVideoSink>);
};
void connect_video (boost::shared_ptr<TimedVideoSink>);
};