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

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 64540195278ea0970f8b7e87d297fd937aa66e23..27fa0745f928b36ace4196d737ec0bede71fdf8d 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -22,7 +22,7 @@
 #define DCPOMATIC_ENCODER_H
 
 #include "types.h"
-#include "player_subtitles.h"
+#include "player_caption.h"
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 
@@ -49,17 +49,9 @@ public:
        virtual bool finishing () const = 0;
 
 protected:
-       virtual void video (boost::shared_ptr<PlayerVideo>, DCPTime) = 0;
-       virtual void audio (boost::shared_ptr<AudioBuffers>, DCPTime) = 0;
-       virtual void subtitle (PlayerSubtitles, DCPTimePeriod) = 0;
-
        boost::shared_ptr<const Film> _film;
        boost::weak_ptr<Job> _job;
        boost::shared_ptr<Player> _player;
-
-       boost::signals2::scoped_connection _player_video_connection;
-       boost::signals2::scoped_connection _player_audio_connection;
-       boost::signals2::scoped_connection _player_subtitle_connection;
 };
 
 #endif