Replace a shared_ptr with a weak_ptr.

2 files changed, 14 insertions, 5 deletions

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 8afd64709..fd44e4df7 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -53,7 +53,7 @@ using boost::dynamic_pointer_cast;
  *  @param f Film that we are transcoding.
  *  @param j Job that this transcoder is being used in.
  */
-Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
+Transcoder::Transcoder (shared_ptr<const Film> film, weak_ptr<Job> j)
 	: _film (film)
 	, _job (j)
 	, _player (new Player (film, film->playlist ()))
@@ -70,7 +70,11 @@ Transcoder::go ()
 	_writer->start ();
 	_encoder->begin ();
 
-	_job->sub (_("Encoding picture and sound"));
+	{
+		shared_ptr<Job> job = _job.lock ();
+		DCPOMATIC_ASSERT (job);
+		job->sub (_("Encoding picture and sound"));
+	}
 
 	DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
 	DCPTime const length = _film->length ();
@@ -99,7 +103,11 @@ Transcoder::go ()
 			_writer->write (_player->get_subtitles (t, frame, true, false, true));
 		}
 
-		_job->set_progress (float(t.get()) / length.get());
+		{
+			shared_ptr<Job> job = _job.lock ();
+			DCPOMATIC_ASSERT (job);
+			job->set_progress (float(t.get()) / length.get());
+		}
 	}
 
 	BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index a01b6a64a..4256a5c91 100644
--- 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,7 +31,7 @@ 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 ();
 
@@ -44,7 +45,7 @@ public:
 
 private:
 	boost::shared_ptr<const Film> _film;
-	boost::shared_ptr<Job> _job;
+	boost::weak_ptr<Job> _job;
 	boost::shared_ptr<Player> _player;
 	boost::shared_ptr<Writer> _writer;
 	boost::shared_ptr<Encoder> _encoder;