X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=97e8bd416a0432697b14dcb2503d6f82d62ba2e0;hb=7f2e74604a51b984e4c8cbb5d5f4bb642677ec00;hp=46fc97fb31b74bdf14f6093dd0d973e34fa78709;hpb=f58d9e44302151dea9f594acd9fc27a331fa77fb;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 46fc97fb3..97e8bd416 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -34,6 +34,7 @@ using std::string;
 using std::stringstream;
 using std::fixed;
 using std::setprecision;
+using std::cout;
 using boost::shared_ptr;
 
 /** @param s Film to use.
@@ -50,6 +51,12 @@ TranscodeJob::name () const
 	return String::compose (_("Transcode %1"), _film->name());
 }
 
+string
+TranscodeJob::json_name () const
+{
+	return N_("transcode");
+}
+
 void
 TranscodeJob::run ()
 {
@@ -66,9 +73,6 @@ TranscodeJob::run ()
 		_transcoder.reset ();
 
 	} catch (...) {
-		set_progress (1);
-		set_state (FINISHED_ERROR);
-		_film->log()->log (N_("Transcode job failed or cancelled"));
 		_transcoder.reset ();
 		throw;
 	}
@@ -97,6 +101,7 @@ TranscodeJob::status () const
 	return s.str ();
 }
 
+/** @return Approximate remaining time in seconds */
 int
 TranscodeJob::remaining_time () const
 {
@@ -114,6 +119,5 @@ TranscodeJob::remaining_time () const
 	}
 
 	/* Compute approximate proposed length here, as it's only here that we need it */
-	VideoFrame const left = _film->time_to_video_frames (_film->length ()) - t->video_frames_out();
-	return left / fps;
+	return (_film->length().frames (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
 }