X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.h;h=d7736d4e8e56dd3a1cdf7440e6a5872bb7a59db1;hb=0dcbc398124f740e4fd7b552926f601a3e5c755e;hp=d5597ad0ecc4d653826f64afc12aaa97d447f00c;hpb=17cea71c34ed6bdba67aac8614572c7511844c2a;p=dcpomatic.git

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index d5597ad0e..d7736d4e8 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -17,46 +17,32 @@
 
 */
 
-#include "decoder.h"
-
-/** @file  src/transcoder.h
- *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
- *
- *  A decoder is selected according to the content type, and the encoder can be specified
- *  as a parameter to the constructor.
- */
+#include "types.h"
+#include "encoder.h"
 
 class Film;
-class Job;
 class Encoder;
-class FilmState;
-class Matcher;
-
-/** @class Transcoder
- *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
- *
- *  A decoder is selected according to the content type, and the encoder can be specified
- *  as a parameter to the constructor.
- */
-class Transcoder
+class VideoFilter;
+class Player;
+
+/** @class Transcoder */
+class Transcoder : public boost::noncopyable
 {
 public:
-	Transcoder (boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j, boost::shared_ptr<Encoder> e);
+	Transcoder (boost::shared_ptr<const Film>, boost::shared_ptr<Job>);
 
 	void go ();
 
-	/** @return Our decoder */
-	boost::shared_ptr<Decoder> decoder () {
-		return _decoder;
+	float current_encoding_rate () const;
+	int video_frames_out () const;
+
+	/** @return true if we are in the process of calling Encoder::process_end */
+	bool finishing () const {
+		return _finishing;
 	}
 
-protected:
-	/** A Job that is running this Transcoder, or 0 */
-	Job* _job;
-	/** The encoder that we will use */
+private:
+	boost::shared_ptr<Player> _player;
 	boost::shared_ptr<Encoder> _encoder;
-	/** The decoder that we will use */
-	boost::shared_ptr<Decoder> _decoder;
-	boost::shared_ptr<Matcher> _matcher;
-	boost::shared_ptr<DelayLine> _delay_line;
+	bool _finishing;
 };