diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-19 21:23:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:45:23 +0100 |
| commit | 0ab83642f0c96ae2681beae04873b3226338a570 (patch) | |
| tree | 0893f0bed5e4ee9f37947edde970e9095ddcb9ba /src/lib/player.h | |
| parent | ff40ecd114547a2fc07bc49403c993c3fa5d40cc (diff) | |
Text to player with types.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 2f1baa53c..a4170f83e 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -22,7 +22,7 @@ #define DCPOMATIC_PLAYER_H #include "player_text.h" -#include "active_subtitles.h" +#include "active_text.h" #include "content_text.h" #include "film.h" #include "content.h" @@ -128,7 +128,7 @@ private: void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio); void bitmap_text_start (boost::weak_ptr<Piece>, ContentBitmapText); void plain_text_start (boost::weak_ptr<Piece>, ContentPlainText); - void subtitle_stop (boost::weak_ptr<Piece>, ContentTime); + void subtitle_stop (boost::weak_ptr<Piece>, ContentTime, TextType); DCPTime one_video_frame () const; void fill_audio (DCPTimePeriod period); std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> discard_audio ( @@ -196,7 +196,7 @@ private: Empty _black; Empty _silent; - ActiveSubtitles _active_subtitles; + ActiveText _active_text[TEXT_COUNT]; boost::shared_ptr<AudioProcessor> _audio_processor; boost::signals2::scoped_connection _film_changed_connection; |