Hand-apply e30fd8d; resurrect JSON server code.

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

diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index 737f10de968ea4b9ee0500cf51bfe2f3b6bc060c..e0145d7d06e082a998bda94f172546166700c7c4 100644 (file)
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -21,10 +21,10 @@
  *  @brief A job which transcodes from one format to another.
  */
 
-#include <boost/shared_ptr.hpp>
 #include "job.h"
+#include <boost/shared_ptr.hpp>
 
-class Encoder;
+class Transcoder;
 
 /** @class TranscodeJob
  *  @brief A job which transcodes from one format to another.
@@ -32,15 +32,15 @@ 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<const Film> f);
        
        std::string name () const;
+       std::string json_name () const;
        void run ();
        std::string status () const;
 
-protected:
+private:
        int remaining_time () const;
 
-private:
-       boost::shared_ptr<Encoder> _encoder;
+       boost::shared_ptr<Transcoder> _transcoder;
 };