X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.h;h=97ecaabfc2a54b9ff48ae7dd8d7640da59fd489c;hb=f861018389acd9d277fe34d7621182b9b54f977f;hp=786010869d35bb04f4528b3827601a62983a3a42;hpb=039ac5848730d154e0b3f3dd841a55e45ba922d8;p=dcpomatic.git

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 786010869..97ecaabfc 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -18,27 +18,22 @@
 */
 
 /** @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 "decoder_factory.h"
-
 class Film;
 class Job;
 class Encoder;
-class FilmState;
 class Matcher;
 class VideoFilter;
 class Gain;
-class VideoDecoder;
-class AudioDecoder;
 class DelayLine;
+class Player;
+class Trimmer;
 
 /** @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.
@@ -48,25 +43,21 @@ class Transcoder
 public:
 	Transcoder (
 		boost::shared_ptr<Film> f,
-		DecodeOptions o,
-		Job* j,
-		boost::shared_ptr<Encoder> e
+		boost::shared_ptr<Job> j
 		);
 
 	void go ();
 
-	boost::shared_ptr<VideoDecoder> video_decoder () const {
-		return _decoders.video;
-	}
+	float current_encoding_rate () const;
+	int video_frames_out () const;
 
 protected:
 	/** A Job that is running this Transcoder, or 0 */
-	Job* _job;
-	/** The encoder that we will use */
+	boost::shared_ptr<Job> _job;
+	boost::shared_ptr<Player> _player;
 	boost::shared_ptr<Encoder> _encoder;
-	/** The decoders that we will use */
-	Decoders _decoders;
 	boost::shared_ptr<Matcher> _matcher;
 	boost::shared_ptr<DelayLine> _delay_line;
 	boost::shared_ptr<Gain> _gain;
+	boost::shared_ptr<Trimmer> _trimmer;
 };