X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=792029a9164f0ea4ce30054af0496501e113ea49;hb=dfb23c675ca145b5570ccb5790ea804ad736a247;hp=64540195278ea0970f8b7e87d297fd937aa66e23;hpb=666d0b238f32c0383068d3d8f3936f46c4e67a14;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 645401952..792029a91 100644
--- 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_text.h"
 #include <boost/weak_ptr.hpp>
 #include <boost/signals2.hpp>
 
@@ -43,23 +43,18 @@ public:
 	virtual void go () = 0;
 
 	/** @return the current frame rate over the last short while */
-	virtual float current_rate () const = 0;
+	virtual boost::optional<float> current_rate () const {
+		return boost::optional<float>();
+	}
+
 	/** @return the number of frames that are done */
 	virtual Frame frames_done () const = 0;
 	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