Merge master.

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

diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index aa640f6979976105e2a214e34426840cd08613fa..7880a925ebb56e4921fea0b2745ab1b3f1882788 100644 (file)
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -24,7 +24,7 @@
 #include <boost/shared_ptr.hpp>
 #include "job.h"
 
-class Encoder;
+class Transcoder;
 
 /** @class TranscodeJob
  *  @brief A job which transcodes from one format to another.
@@ -32,12 +32,14 @@ class Encoder;
 class TranscodeJob : public Job
 {
 public:
-       TranscodeJob (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Log* l);
+       TranscodeJob (boost::shared_ptr<Film> f);
        
        std::string name () const;
        void run ();
        std::string status () const;
 
 private:
-       boost::shared_ptr<Encoder> _encoder;
+       int remaining_time () const;
+
+       boost::shared_ptr<Transcoder> _transcoder;
 };