Reword again: Text -> Caption and Plain -> Text.

[dcpomatic.git] / src / lib / player.h

diff --git a/src/lib/player.h b/src/lib/player.h
index a4170f83e7dd5b4e23e7e54b340c79973e98aff7..16e9d57a5b38d92af5a0431b988a3c5413275d9a 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -21,8 +21,8 @@
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include "player_text.h"
-#include "active_text.h"
+#include "player_caption.h"
+#include "active_captions.h"
 #include "content_text.h"
 #include "film.h"
 #include "content.h"
@@ -98,10 +98,10 @@ public:
        /** Emitted when a video frame is ready.  These emissions happen in the correct order. */
        boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>, DCPTime)> Video;
        boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime)> Audio;
-       /** Emitted when a subtitle is ready.  This signal may be emitted considerably
+       /** Emitted when a caption is ready.  This signal may be emitted considerably
         *  after the corresponding Video.
         */
-       boost::signals2::signal<void (PlayerText, DCPTimePeriod)> Subtitle;
+       boost::signals2::signal<void (PlayerCaption, TextType, DCPTimePeriod)> Text;
 
 private:
        friend class PlayerWrapper;
@@ -126,8 +126,8 @@ 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>, ContentBitmapText);
-       void plain_text_start (boost::weak_ptr<Piece>, ContentPlainText);
+       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, TextType);
        DCPTime one_video_frame () const;
        void fill_audio (DCPTimePeriod period);
@@ -196,7 +196,7 @@ private:
        Empty _black;
        Empty _silent;
 
-       ActiveText _active_text[TEXT_COUNT];
+       ActiveCaptions _active_text[TEXT_COUNT];
        boost::shared_ptr<AudioProcessor> _audio_processor;
 
        boost::signals2::scoped_connection _film_changed_connection;