X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=a0537cd428b343f2190bd07a57bdaee8ad65953c;hb=e8c1880a2b9a40eb11ee259feee3edd799139a43;hp=fe07ba2f656af010c1ff989a53a4f1e088822ed6;hpb=f0e95aa5b7ada81a1c40f06facab2e94e45ab26c;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index fe07ba2f6..a0537cd42 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -50,6 +50,12 @@ TranscodeJob::name () const
 	return String::compose (_("Transcode %1"), _film->name());
 }
 
+string
+TranscodeJob::json_name () const
+{
+	return N_("transcode");
+}
+
 void
 TranscodeJob::run ()
 {
@@ -63,13 +69,13 @@ TranscodeJob::run ()
 		set_state (FINISHED_OK);
 
 		_film->log()->log (N_("Transcode job completed successfully"));
+		_transcoder.reset ();
 
-	} catch (std::exception& e) {
-
+	} catch (...) {
 		set_progress (1);
 		set_state (FINISHED_ERROR);
-		_film->log()->log (String::compose (N_("Transcode job failed (%1)"), e.what()));
-
+		_film->log()->log (N_("Transcode job failed or cancelled"));
+		_transcoder.reset ();
 		throw;
 	}
 }
@@ -78,7 +84,7 @@ string
 TranscodeJob::status () const
 {
 	if (!_transcoder) {
-		return _("0%");
+		return Job::status ();
 	}
 
 	float const fps = _transcoder->current_encoding_rate ();
@@ -100,17 +106,20 @@ TranscodeJob::status () const
 int
 TranscodeJob::remaining_time () const
 {
-	if (!_transcoder) {
+	/* _transcoder might be destroyed by the job-runner thread */
+	shared_ptr<Transcoder> t = _transcoder;
+	
+	if (!t) {
 		return 0;
 	}
 	
-	float fps = _transcoder->current_encoding_rate ();
+	float fps = t->current_encoding_rate ();
 
 	if (fps == 0) {
 		return 0;
 	}
 
 	/* Compute approximate proposed length here, as it's only here that we need it */
-	VideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out();
+	VideoFrame const left = _film->time_to_video_frames (_film->length ()) - t->video_frames_out();
 	return left / fps;
 }