summaryrefslogtreecommitdiff
path: root/src/lib/player.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-20 23:16:40 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-20 23:16:40 +0100
commit1013175d5f6adfa0e6a7442e4c9aebb893787748 (patch)
tree039939d2e10efec2708d8f42a2946ed838eb39b8 /src/lib/player.h
parentaa0c63e482b63d7e85407ca72fa0ba5e5e1259ad (diff)
Key ActiveCaptions on a CaptionContent rather than a Piece.
Diffstat (limited to 'src/lib/player.h')
-rw-r--r--src/lib/player.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index cbadb11f6..d0f1eec6d 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -126,9 +126,9 @@ private:
boost::shared_ptr<PlayerVideo> black_player_video_frame (Eyes eyes) const;
void video (boost::weak_ptr<Piece>, ContentVideo);
void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
- void bitmap_text_start (boost::weak_ptr<Piece>, ContentBitmapCaption);
- void plain_text_start (boost::weak_ptr<Piece>, ContentTextCaption);
- void subtitle_stop (boost::weak_ptr<Piece>, ContentTime, CaptionType);
+ void bitmap_text_start (boost::weak_ptr<Piece>, boost::weak_ptr<CaptionContent>, ContentBitmapCaption);
+ void plain_text_start (boost::weak_ptr<Piece>, boost::weak_ptr<CaptionContent>, ContentTextCaption);
+ void subtitle_stop (boost::weak_ptr<Piece>, boost::weak_ptr<CaptionContent>, ContentTime, CaptionType);
DCPTime one_video_frame () const;
void fill_audio (DCPTimePeriod period);
std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> discard_audio (