diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-24 01:12:40 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-24 01:12:40 +0000 |
| commit | dc87445987c00b85a44b6372e43894067fae44b3 (patch) | |
| tree | cddc35f1117f5bcb403b31d674791e6a453765ab /src/lib/player.h | |
| parent | e194f0003b60b2607da0822485c56cd8267e78dc (diff) | |
Merge 1.0 and some subtitling fixes.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index b4454b859..ffc9cf3e3 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -148,7 +148,9 @@ private: struct { Position<int> position; - boost::shared_ptr<DecodedSubtitle> subtitle; + boost::shared_ptr<Image> image; + DCPTime from; + DCPTime to; } _out_subtitle; #ifdef DCPOMATIC_DEBUG |