No-op: remove all trailing whitespace.

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

diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index fe68a49100630dac9b9cad0bfc72cf284f016b44..23a856069d15b6529be66aa6cfebd4f3355c8bfc 100644 (file)
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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, boost::shared_ptr<Job> req);
-       
+       TranscodeJob (boost::shared_ptr<const Film>);
+
        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;
 };