X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.h;h=7bf214a88de6ccbbb3b53bacc43fb8c8791de410;hb=9e124e8ce2eb7a9faeb91b33169ab1ae4912afb0;hp=43c70df0066be67e26fe5f9d921422204930f902;hpb=89319eb1217c8caca80dc22ca770766f6d2f26c0;p=dcpomatic.git

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 43c70df00..7bf214a88 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -17,52 +17,33 @@
 
 */
 
-/** @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 VideoFilter;
-class Gain;
-class VideoDecoder;
-class AudioDecoder;
-class DelayLine;
-class Options;
+class Player;
 
-/** @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 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> f,
+		boost::shared_ptr<Job> j
+		);
 
 	void go ();
 
-	boost::shared_ptr<VideoDecoder> video_decoder () const {
-		return _decoders.first;
-	}
+	float current_encoding_rate () const;
+	Encoder::State state () const;
+	int video_frames_out () const;
 
-protected:
-	boost::shared_ptr<Film> _film;
-	boost::shared_ptr<const Options> _opt;
+private:
 	/** 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 */
-	std::pair<boost::shared_ptr<VideoDecoder>, boost::shared_ptr<AudioDecoder> > _decoders;
-	boost::shared_ptr<Matcher> _matcher;
-	boost::shared_ptr<DelayLine> _delay_line;
-	boost::shared_ptr<Gain> _gain;
 };