X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.h;h=14ad693c370975a2ca0b0523eb948882240d600a;hb=0f42e807a707249cd1a60fa6e476cb47a4147c5a;hp=8f78e7f6a899b8d3e5dda3f11da4adce2a1fdfcc;hpb=420adb1fd2910fd24eb84be98169afc209f76a0e;p=dcpomatic.git

diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index 8f78e7f6a..14ad693c3 100644
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -1,19 +1,20 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,11 +22,10 @@
  *  @brief A job which transcodes from one format to another.
  */
 
-#include <boost/shared_ptr.hpp>
 #include "job.h"
-#include "options.h"
+#include <boost/shared_ptr.hpp>
 
-class Encoder;
+class Transcoder;
 
 /** @class TranscodeJob
  *  @brief A job which transcodes from one format to another.
@@ -33,16 +33,15 @@ class Encoder;
 class TranscodeJob : public Job
 {
 public:
-	TranscodeJob (boost::shared_ptr<Film> f, DecodeOptions od, boost::shared_ptr<Job> req);
-	
+	TranscodeJob (boost::shared_ptr<const Film> film);
+
 	std::string name () const;
+	std::string json_name () const;
 	void run ();
 	std::string status () const;
 
-protected:
+private:
 	int remaining_time () const;
 
-private:
-	DecodeOptions _decode_opt;
-	boost::shared_ptr<Encoder> _encoder;
+	boost::shared_ptr<Transcoder> _transcoder;
 };