X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=8924fa09c49fcdd09cef5637f5e27496de564f0e;hb=f98c4cdec82fc2fbdcc4ca19748d09b0ea0556b4;hp=1c66d87d379a7ba8395fa128be4c4aa26876220b;hpb=a00ebbc68438e84076c65e99d0e70403afb4407d;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 1c66d87d3..8924fa09c 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -26,22 +26,25 @@
 #include <libdcp/exceptions.h>
 #include "job.h"
 #include "util.h"
+#include "cross.h"
+#include "ui_signaller.h"
+#include "exceptions.h"
 
 #include "i18n.h"
 
 using std::string;
 using std::list;
+using std::cout;
 using std::stringstream;
 using boost::shared_ptr;
 
-/** @param s Film that we are operating on.
- */
-Job::Job (shared_ptr<Film> f)
+Job::Job (shared_ptr<const Film> f)
 	: _film (f)
 	, _thread (0)
 	, _state (NEW)
 	, _start_time (0)
 	, _progress_unknown (false)
+	, _last_set (0)
 	, _ran_for (0)
 {
 	descend (1);
@@ -83,17 +86,27 @@ Job::run_wrapper ()
 
 		set_error (e.what(), m);
 
+	} catch (OpenFileError& e) {
+
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
+		set_error (
+			String::compose (_("Could not open %1"), e.file().string()),
+			String::compose (_("DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in an unexpected format."), e.file().string())
+			);
+
 	} catch (boost::thread_interrupted &) {
 
 		set_state (FINISHED_CANCELLED);
- 		
+		
 	} catch (std::exception& e) {
 
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 		set_error (
 			e.what (),
-			_("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
+			_("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)")
 			);
 
 	} catch (...) {
@@ -102,7 +115,7 @@ Job::run_wrapper ()
 		set_state (FINISHED_ERROR);
 		set_error (
 			_("Unknown error"),
-			_("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
+			_("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)")
 			);
 
 	}
@@ -155,17 +168,33 @@ Job::finished_cancelled () const
 	return _state == FINISHED_CANCELLED;
 }
 
+bool
+Job::paused () const
+{
+	boost::mutex::scoped_lock lm (_state_mutex);
+	return _state == PAUSED;
+}
+	
 /** Set the state of this job.
  *  @param s New state.
  */
 void
 Job::set_state (State s)
 {
-	boost::mutex::scoped_lock lm (_state_mutex);
-	_state = s;
+	bool finished = false;
+	
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		_state = s;
+
+		if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) {
+			_ran_for = elapsed_time ();
+			finished = true;
+		}
+	}
 
-	if (_state == FINISHED_OK || _state == FINISHED_ERROR) {
-		_ran_for = elapsed_time ();
+	if (finished && ui_signaller) {
+		ui_signaller->emit (boost::bind (boost::ref (Finished)));
 	}
 }
 
@@ -186,10 +215,25 @@ Job::elapsed_time () const
 void
 Job::set_progress (float p)
 {
+	if (fabs (p - _last_set) < 0.01) {
+		/* Calm excessive progress reporting */
+		return;
+	}
+
+	_last_set = p;
+
 	boost::mutex::scoped_lock lm (_progress_mutex);
 	_progress_unknown = false;
 	_stack.back().normalised = p;
 	boost::this_thread::interruption_point ();
+
+	if (paused ()) {
+		dcpomatic_sleep (1);
+	}
+
+	if (ui_signaller) {
+		ui_signaller->emit (boost::bind (boost::ref (Progress)));
+	}
 }
 
 /** @return fractional overall progress, or -1 if not known */
@@ -326,3 +370,19 @@ Job::cancel ()
 	_thread->interrupt ();
 	_thread->join ();
 }
+
+void
+Job::pause ()
+{
+	if (running ()) {
+		set_state (PAUSED);
+	}
+}
+
+void
+Job::resume ()
+{
+	if (paused ()) {
+		set_state (RUNNING);
+	}
+}