Merge branch '1.0' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic into 1.0

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

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 97ecaabfc2a54b9ff48ae7dd8d7640da59fd489c..007065b658cd7240f15001f1361f549aa1378493 100644 (file)
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -17,6 +17,8 @@
 
 */
 
+#include "types.h"
+
 /** @file  src/transcoder.h
  *
  *  A decoder is selected according to the content type, and the encoder can be specified
@@ -26,23 +28,19 @@
 class Film;
 class Job;
 class Encoder;
-class Matcher;
 class VideoFilter;
-class Gain;
-class DelayLine;
 class Player;
-class Trimmer;
 
 /** @class Transcoder
  *
  *  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 : public boost::noncopyable
 {
 public:
        Transcoder (
-               boost::shared_ptr<Film> f,
+               boost::shared_ptr<const Film> f,
                boost::shared_ptr<Job> j
                );
 
@@ -51,13 +49,9 @@ public:
        float current_encoding_rate () const;
        int video_frames_out () const;
 
-protected:
+private:
        /** A Job that is running this Transcoder, or 0 */
        boost::shared_ptr<Job> _job;
        boost::shared_ptr<Player> _player;
        boost::shared_ptr<Encoder> _encoder;
-       boost::shared_ptr<Matcher> _matcher;
-       boost::shared_ptr<DelayLine> _delay_line;
-       boost::shared_ptr<Gain> _gain;
-       boost::shared_ptr<Trimmer> _trimmer;
 };