diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-19 13:44:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:45:23 +0100 |
| commit | 491176352b80bea000564e6662738722185be721 (patch) | |
| tree | 34211a43cefdec49f43b4a990897fdb4102a5aa2 /src/lib/player.h | |
| parent | 0fb9916d6734dbea4cb55b6d42923468aee45a40 (diff) | |
Remove old content_subtitle.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index b0ffe0e04..abc06721a 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -23,13 +23,13 @@ #include "player_subtitles.h" #include "active_subtitles.h" +#include "content_text.h" #include "film.h" #include "content.h" #include "position_image.h" #include "piece.h" #include "content_video.h" #include "content_audio.h" -#include "content_subtitle.h" #include "audio_stream.h" #include "audio_merger.h" #include "empty.h" @@ -127,7 +127,7 @@ private: void video (boost::weak_ptr<Piece>, ContentVideo); 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>, ContentTextSubtitle); + void plain_text_start (boost::weak_ptr<Piece>, ContentPlainText); void subtitle_stop (boost::weak_ptr<Piece>, ContentTime); DCPTime one_video_frame () const; void fill_audio (DCPTimePeriod period); |