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

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

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index 0fa20c2c9c9fa19276c1bf7af8733e30127583ce..850ead6568f655df4613fc2bb2986b2356d22c96 100644 (file)
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,7 +19,7 @@
 */
 
 #include "types.h"
-#include "player_subtitles.h"
+#include "player_caption.h"
 #include "encoder.h"
 #include <boost/weak_ptr.hpp>
 
@@ -52,10 +52,8 @@ private:
 
        void video (boost::shared_ptr<PlayerVideo>, DCPTime);
        void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
-       void subtitle (PlayerSubtitles, DCPTimePeriod);
+       void text (PlayerCaption, TextType, DCPTimePeriod);
 
-       boost::shared_ptr<const Film> _film;
-       boost::weak_ptr<Job> _job;
        boost::shared_ptr<Writer> _writer;
        boost::shared_ptr<J2KEncoder> _j2k_encoder;
        bool _finishing;
@@ -63,5 +61,5 @@ private:
 
        boost::signals2::scoped_connection _player_video_connection;
        boost::signals2::scoped_connection _player_audio_connection;
-       boost::signals2::scoped_connection _player_subtitle_connection;
+       boost::signals2::scoped_connection _player_text_connection;
 };