summaryrefslogtreecommitdiff
path: root/src/lib/player_video.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-20 19:55:22 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-20 19:55:22 +0100
commitad70feebe3a9a89865185b05e084b326637ff81e (patch)
treed440c1c5ab27cb5cde4333943654d57a40793684 /src/lib/player_video.h
parentf82bdaa6ffe1a9e62a010de405f8bbb7ea392f00 (diff)
Untested; allow viewing of subtitles or closed captions in the preview.
Diffstat (limited to 'src/lib/player_video.h')
-rw-r--r--src/lib/player_video.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index f4bf2a471..96878e0bd 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -60,7 +60,7 @@ public:
boost::shared_ptr<PlayerVideo> shallow_copy () const;
- void set_subtitle (PositionImage);
+ void set_caption (PositionImage);
void prepare ();
boost::shared_ptr<Image> image (dcp::NoteHandler note, boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
@@ -109,7 +109,7 @@ private:
Eyes _eyes;
Part _part;
boost::optional<ColourConversion> _colour_conversion;
- boost::optional<PositionImage> _subtitle;
+ boost::optional<PositionImage> _caption;
/** Content that we came from. This is so that reset_metadata() can work */
boost::weak_ptr<Content> _content;
/** Video frame that we came from. Again, this is for reset_metadata() */