Various bits.

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

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 786010869d35bb04f4528b3827601a62983a3a42..2d032fcf640538ca06f99780f2be9a97b4fb7004 100644 (file)
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -18,27 +18,21 @@
 */
 
 /** @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 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,24 +42,16 @@ 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;
-       }
-
 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;