Clean up of 3D->2D conversion.

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

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 01446dccda49f1c08a9e35d0e64bbb40b7a34f00..14f3636619a8303aacf2d568011df8883c5ec6de 100644 (file)
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -19,6 +19,7 @@
 */
 
 #include "types.h"
+#include <boost/weak_ptr.hpp>
 
 class Film;
 class Encoder;
@@ -30,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 {
@@ -44,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;