Clean up after previous commit.

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

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index 7fbb076f3d313cceb550fd5c3104e26ce5ca4092..9808987c3ce61eee7bdb9b34db8eead74590e7d1 100644 (file)
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -19,7 +19,7 @@
 */
 
 #include "types.h"
-#include "player_text.h"
+#include "player_caption.h"
 #include "encoder.h"
 #include <boost/weak_ptr.hpp>
 
@@ -52,7 +52,7 @@ private:
 
        void video (boost::shared_ptr<PlayerVideo>, DCPTime);
        void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
-       void subtitle (PlayerText, DCPTimePeriod);
+       void caption (PlayerCaption, CaptionType, DCPTimePeriod);
 
        boost::shared_ptr<Writer> _writer;
        boost::shared_ptr<J2KEncoder> _j2k_encoder;
@@ -61,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_caption_connection;
 };