From 2e536ef0971edefea23810b99f7706881072783b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 8 Feb 2013 13:07:16 +0000
Subject: [PATCH] Shuffle Job pointers around slightly.

---
 src/lib/ab_transcoder.cc          |  8 +++++---
 src/lib/audio_decoder.cc          |  4 ++--
 src/lib/audio_decoder.h           |  2 +-
 src/lib/decoder.cc                |  5 +----
 src/lib/decoder.h                 |  5 +----
 src/lib/decoder_factory.cc        | 10 +++++-----
 src/lib/decoder_factory.h         |  3 +--
 src/lib/examine_content_job.cc    |  4 ++--
 src/lib/external_audio_decoder.cc |  6 +++---
 src/lib/external_audio_decoder.h  |  2 +-
 src/lib/ffmpeg_decoder.cc         |  8 ++++----
 src/lib/ffmpeg_decoder.h          |  2 +-
 src/lib/film.cc                   |  4 ++--
 src/lib/imagemagick_decoder.cc    |  6 +++---
 src/lib/imagemagick_decoder.h     |  2 +-
 src/lib/transcoder.cc             |  6 ++++--
 src/lib/video_decoder.cc          | 12 +++++++-----
 src/lib/video_decoder.h           |  4 ++--
 src/wx/film_viewer.cc             |  2 +-
 19 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index fc4fb8daa..f47a99fda 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -55,8 +55,8 @@ ABTranscoder::ABTranscoder (
 	, _job (j)
 	, _encoder (e)
 {
-	_da = decoder_factory (_film_a, o, j);
-	_db = decoder_factory (_film_b, o, j);
+	_da = decoder_factory (_film_a, o);
+	_db = decoder_factory (_film_b, o);
 
 	if (_film_a->audio_stream()) {
 		shared_ptr<AudioStream> st = _film_a->audio_stream();
@@ -98,7 +98,9 @@ ABTranscoder::go ()
 		bool const vb = _db.video->pass ();
 		bool const a = _da.audio->pass ();
 
-		_da.video->set_progress ();
+		if (_job) {
+			_da.video->set_progress (_job);
+		}
 
 		if (va && vb && a) {
 			break;
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index a038dd2bb..a54c14843 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -23,8 +23,8 @@
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<Film> f, DecodeOptions o, Job* j)
-	: Decoder (f, o, j)
+AudioDecoder::AudioDecoder (shared_ptr<Film> f, DecodeOptions o)
+	: Decoder (f, o)
 {
 
 }
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 3bf585f4d..9bef8e0e7 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -34,7 +34,7 @@
 class AudioDecoder : public AudioSource, public virtual Decoder
 {
 public:
-	AudioDecoder (boost::shared_ptr<Film>, DecodeOptions, Job *);
+	AudioDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
 	virtual void set_audio_stream (boost::shared_ptr<AudioStream>);
 
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index fd0abee41..30009460f 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -26,7 +26,6 @@
 #include <boost/lexical_cast.hpp>
 #include "film.h"
 #include "format.h"
-#include "job.h"
 #include "options.h"
 #include "exceptions.h"
 #include "image.h"
@@ -47,12 +46,10 @@ using boost::optional;
 
 /** @param f Film.
  *  @param o Decode options.
- *  @param j Job that we are running within, or 0
  */
-Decoder::Decoder (boost::shared_ptr<Film> f, DecodeOptions o, Job* j)
+Decoder::Decoder (boost::shared_ptr<Film> f, DecodeOptions o)
 	: _film (f)
 	, _opt (o)
-	, _job (j)
 {
 	_film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
 }
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index cc4c87373..f2f523516 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -36,7 +36,6 @@
 #include "film.h"
 #include "options.h"
 
-class Job;
 class Image;
 class Log;
 class DelayLine;
@@ -54,7 +53,7 @@ class FilterGraph;
 class Decoder
 {
 public:
-	Decoder (boost::shared_ptr<Film>, DecodeOptions, Job *);
+	Decoder (boost::shared_ptr<Film>, DecodeOptions);
 	virtual ~Decoder () {}
 
 	virtual bool pass () = 0;
@@ -68,8 +67,6 @@ protected:
 	boost::shared_ptr<Film> _film;
 	/** our decode options */
 	DecodeOptions _opt;
-	/** associated Job, or 0 */
-	Job* _job;
 
 private:
 	virtual void film_changed (Film::Property) {}
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index c4d818f49..59e15722d 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -36,21 +36,21 @@ using boost::dynamic_pointer_cast;
 
 Decoders
 decoder_factory (
-	shared_ptr<Film> f, DecodeOptions o, Job* j
+	shared_ptr<Film> f, DecodeOptions o
 	)
 {
 	if (boost::filesystem::is_directory (f->content_path()) || f->content_type() == STILL) {
 		/* A single image file, or a directory of them */
 		return Decoders (
-			shared_ptr<VideoDecoder> (new ImageMagickDecoder (f, o, j)),
-			shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o, j))
+			shared_ptr<VideoDecoder> (new ImageMagickDecoder (f, o)),
+			shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o))
 			);
 	}
 
-	shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (f, o, j));
+	shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (f, o));
 	if (f->use_content_audio()) {
 		return Decoders (fd, fd);
 	}
 
-	return Decoders (fd, shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o, j)));
+	return Decoders (fd, shared_ptr<AudioDecoder> (new ExternalAudioDecoder (f, o)));
 }
diff --git a/src/lib/decoder_factory.h b/src/lib/decoder_factory.h
index 445a1c8a2..8076b01c7 100644
--- a/src/lib/decoder_factory.h
+++ b/src/lib/decoder_factory.h
@@ -27,7 +27,6 @@
 #include "options.h"
 
 class Film;
-class Job;
 class VideoDecoder;
 class AudioDecoder;
 
@@ -44,7 +43,7 @@ struct Decoders {
 };
 
 extern Decoders decoder_factory (
-	boost::shared_ptr<Film>, DecodeOptions, Job *
+	boost::shared_ptr<Film>, DecodeOptions
 	);
 
 #endif
diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 69a757e2b..94e5320fe 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -81,7 +81,7 @@ ExamineContentJob::run ()
 		DecodeOptions o;
 		o.decode_audio = false;
 		
-		Decoders decoders = decoder_factory (_film, o, this);
+		Decoders decoders = decoder_factory (_film, o);
 		
 		set_progress_unknown ();
 		while (!decoders.video->pass()) {
@@ -96,7 +96,7 @@ ExamineContentJob::run ()
 
 		/* Get a quick decoder to get the content's length from its header */
 		
-		Decoders d = decoder_factory (_film, DecodeOptions(), 0);
+		Decoders d = decoder_factory (_film, DecodeOptions());
 		_film->set_length (d.video->length());
 	
 		_film->log()->log (String::compose ("Video length obtained from header as %1 frames", _film->length().get()));
diff --git a/src/lib/external_audio_decoder.cc b/src/lib/external_audio_decoder.cc
index 366051418..9c01bfb34 100644
--- a/src/lib/external_audio_decoder.cc
+++ b/src/lib/external_audio_decoder.cc
@@ -31,9 +31,9 @@ using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 
-ExternalAudioDecoder::ExternalAudioDecoder (shared_ptr<Film> f, DecodeOptions o, Job* j)
-	: Decoder (f, o, j)
-	, AudioDecoder (f, o, j)
+ExternalAudioDecoder::ExternalAudioDecoder (shared_ptr<Film> f, DecodeOptions o)
+	: Decoder (f, o)
+	, AudioDecoder (f, o)
 {
 	sf_count_t frames;
 	vector<SNDFILE*> sf = open_files (frames);
diff --git a/src/lib/external_audio_decoder.h b/src/lib/external_audio_decoder.h
index 37e53bca7..6f010abb1 100644
--- a/src/lib/external_audio_decoder.h
+++ b/src/lib/external_audio_decoder.h
@@ -44,7 +44,7 @@ private:
 class ExternalAudioDecoder : public AudioDecoder
 {
 public:
-	ExternalAudioDecoder (boost::shared_ptr<Film>, DecodeOptions, Job *);
+	ExternalAudioDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
 	bool pass ();
 
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 81f405644..1f11f70a0 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -60,10 +60,10 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 using libdcp::Size;
 
-FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, DecodeOptions o, Job* j)
-	: Decoder (f, o, j)
-	, VideoDecoder (f, o, j)
-	, AudioDecoder (f, o, j)
+FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, DecodeOptions o)
+	: Decoder (f, o)
+	, VideoDecoder (f, o)
+	, AudioDecoder (f, o)
 	, _format_context (0)
 	, _video_stream (-1)
 	, _frame (0)
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 9a4e65ebc..17308eb56 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -86,7 +86,7 @@ private:
 class FFmpegDecoder : public VideoDecoder, public AudioDecoder
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<Film>, DecodeOptions, Job *);
+	FFmpegDecoder (boost::shared_ptr<Film>, DecodeOptions);
 	~FFmpegDecoder ();
 
 	float frames_per_second () const;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 59f79e666..ff4d3b8f5 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -857,7 +857,7 @@ Film::set_content (string c)
 	*/
 
 	try {
-		Decoders d = decoder_factory (shared_from_this(), DecodeOptions(), 0);
+		Decoders d = decoder_factory (shared_from_this(), DecodeOptions());
 		
 		set_size (d.video->native_size ());
 		set_frames_per_second (d.video->frames_per_second ());
@@ -1079,7 +1079,7 @@ Film::set_external_audio (vector<string> a)
 		_external_audio = a;
 	}
 
-	shared_ptr<ExternalAudioDecoder> decoder (new ExternalAudioDecoder (shared_from_this(), DecodeOptions(), 0));
+	shared_ptr<ExternalAudioDecoder> decoder (new ExternalAudioDecoder (shared_from_this(), DecodeOptions()));
 	if (decoder->audio_stream()) {
 		_external_audio_stream = decoder->audio_stream ();
 	}
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 99b9e1d34..42fe699d7 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -30,9 +30,9 @@ using boost::shared_ptr;
 using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (
-	boost::shared_ptr<Film> f, DecodeOptions o, Job* j)
-	: Decoder (f, o, j)
-	, VideoDecoder (f, o, j)
+	boost::shared_ptr<Film> f, DecodeOptions o)
+	: Decoder (f, o)
+	, VideoDecoder (f, o)
 {
 	if (boost::filesystem::is_directory (_film->content_path())) {
 		for (
diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 84a6f15f9..0e375f6e9 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -26,7 +26,7 @@ namespace Magick {
 class ImageMagickDecoder : public VideoDecoder
 {
 public:
-	ImageMagickDecoder (boost::shared_ptr<Film>, DecodeOptions, Job *);
+	ImageMagickDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
 	float frames_per_second () const {
 		/* We don't know */
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 93963761e..959fac857 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -51,7 +51,7 @@ using boost::dynamic_pointer_cast;
 Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<Encoder> e)
 	: _job (j)
 	, _encoder (e)
-	, _decoders (decoder_factory (f, o, j))
+	, _decoders (decoder_factory (f, o))
 {
 	assert (_encoder);
 
@@ -96,7 +96,9 @@ Transcoder::go ()
 		while (1) {
 			if (!done[0]) {
 				done[0] = _decoders.video->pass ();
-				_decoders.video->set_progress ();
+				if (_job) {
+					_decoders.video->set_progress (_job);
+				}
 			}
 
 			if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) {
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index c11b752ae..c1f48cb5e 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -28,8 +28,8 @@
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<Film> f, DecodeOptions o, Job* j)
-	: Decoder (f, o, j)
+VideoDecoder::VideoDecoder (shared_ptr<Film> f, DecodeOptions o)
+	: Decoder (f, o)
 	, _video_frame (0)
 	, _last_source_time (0)
 {
@@ -110,9 +110,11 @@ VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
 }
 
 void
-VideoDecoder::set_progress () const
+VideoDecoder::set_progress (Job* j) const
 {
-	if (_job && _film->length()) {
-		_job->set_progress (float (_video_frame) / _film->length().get());
+	assert (j);
+	
+	if (_film->length()) {
+		j->set_progress (float (_video_frame) / _film->length().get());
 	}
 }
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index ef1ab041a..283ab5d88 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -27,7 +27,7 @@
 class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<Film>, DecodeOptions, Job *);
+	VideoDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
 	/** @return video frames per second, or 0 if unknown */
 	virtual float frames_per_second () const = 0;
@@ -43,7 +43,7 @@ public:
 
 	virtual void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
 
-	void set_progress () const;
+	void set_progress (Job *) const;
 	
 	int video_frame () const {
 		return _video_frame;
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 4e5f38300..4e779a693 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -101,7 +101,7 @@ FilmViewer::film_changed (Film::Property p)
 		o.decode_audio = false;
 		o.decode_subtitles = true;
 		o.video_sync = false;
-		_decoders = decoder_factory (_film, o, 0);
+		_decoders = decoder_factory (_film, o);
 		_decoders.video->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
 		_decoders.video->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this));
 		_decoders.video->set_subtitle_stream (_film->subtitle_stream());
-- 
2.30.2