X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.h;h=14f3636619a8303aacf2d568011df8883c5ec6de;hb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;hp=0dc0560c0c0313b44e5a6a5ab66486182761a592;hpb=dd8a7d1bbb8f2afb1b98d2be856ff0a9920e180d;p=dcpomatic.git

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 0dc0560c0..14f363661 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -1,23 +1,25 @@
 /*
     Copyright (C) 2012 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/>.
 
 */
 
 #include "types.h"
+#include <boost/weak_ptr.hpp>
 
 class Film;
 class Encoder;
@@ -29,12 +31,12 @@ class Job;
 class Transcoder : public boost::noncopyable
 {
 public:
-	Transcoder (boost::shared_ptr<const Film>, boost::shared_ptr<Job>);
+	Transcoder (boost::shared_ptr<const Film>, boost::weak_ptr<Job>);
 
 	void go ();
 
 	float current_encoding_rate () const;
-	int video_frames_out () const;
+	int video_frames_enqueued () const;
 
 	/** @return true if we are in the process of calling Encoder::process_end */
 	bool finishing () const {
@@ -43,6 +45,7 @@ public:
 
 private:
 	boost::shared_ptr<const Film> _film;
+	boost::weak_ptr<Job> _job;
 	boost::shared_ptr<Player> _player;
 	boost::shared_ptr<Writer> _writer;
 	boost::shared_ptr<Encoder> _encoder;