diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-30 09:33:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-30 20:38:12 +0100 |
| commit | a4d8e5d24beddb719180e75f1047ae317bef85a4 (patch) | |
| tree | 9884019a61aabfc0658d16e29cfd6a4b4a21c485 /src/lib/player_video.h | |
| parent | 391d85619ac19a2a93696ddc35c222eb9bb5d9d6 (diff) | |
Basic video fade support.
Diffstat (limited to 'src/lib/player_video.h')
| -rw-r--r-- | src/lib/player_video.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 59894a227..0f5e83b10 100644 --- a/src/lib/player_video.h +++ b/src/lib/player_video.h @@ -37,7 +37,19 @@ class EncodedData; class PlayerVideo { public: - PlayerVideo (boost::shared_ptr<const ImageProxy>, DCPTime, Crop, dcp::Size, dcp::Size, Scaler const *, Eyes, Part, ColourConversion); + PlayerVideo ( + boost::shared_ptr<const ImageProxy>, + DCPTime, + Crop, + boost::optional<float>, + dcp::Size, + dcp::Size, + Scaler const *, + Eyes, + Part, + ColourConversion + ); + PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>, boost::shared_ptr<Log>); void set_subtitle (PositionImage); @@ -76,6 +88,7 @@ private: boost::shared_ptr<const ImageProxy> _in; DCPTime _time; Crop _crop; + boost::optional<float> _fade; dcp::Size _inter_size; dcp::Size _out_size; Scaler const * _scaler; |