X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fjob.cc;h=5d8a68ec0af132b9a1b8143e6af52642fadfb9c2;hb=0082d0c784a83746d883182ce49ea298f7a1390e;hp=ff0332d6daeee092ca29cc6c720bfb0098b6d30c;hpb=e94cd129dcd66a76210880bfdf19d27f7992651b;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index ff0332d6d..5d8a68ec0 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -26,6 +26,9 @@
 #include <libdcp/exceptions.h>
 #include "job.h"
 #include "util.h"
+#include "cross.h"
+#include "ui_signaller.h"
+#include "exceptions.h"
 
 #include "i18n.h"
 
@@ -34,7 +37,7 @@ using std::list;
 using std::stringstream;
 using boost::shared_ptr;
 
-Job::Job (shared_ptr<Film> f)
+Job::Job (shared_ptr<const Film> f)
 	: _film (f)
 	, _thread (0)
 	, _state (NEW)
@@ -68,26 +71,40 @@ Job::run_wrapper ()
 		set_state (FINISHED_ERROR);
 		
 		string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
-		
-		boost::filesystem::space_info const s = boost::filesystem::space (e.filename());
-		if (s.available < pow (1024, 3)) {
-			m += N_("\n\n");
-			m += _("The drive that the film is stored on is low in disc space.  Free some more space and try again.");
+
+		try {
+			boost::filesystem::space_info const s = boost::filesystem::space (e.filename());
+			if (s.available < pow (1024, 3)) {
+				m += N_("\n\n");
+				m += _("The drive that the film is stored on is low in disc space.  Free some more space and try again.");
+			}
+		} catch (...) {
+
 		}
 
 		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 (dcpomatic@carlh.net)")
 			);
 
 	} catch (...) {
@@ -96,7 +113,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 (dcpomatic@carlh.net)")
 			);
 
 	}
@@ -149,6 +166,13 @@ 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.
  */
@@ -158,8 +182,11 @@ Job::set_state (State s)
 	boost::mutex::scoped_lock lm (_state_mutex);
 	_state = s;
 
-	if (_state == FINISHED_OK || _state == FINISHED_ERROR) {
+	if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) {
 		_ran_for = elapsed_time ();
+		if (ui_signaller) {
+			ui_signaller->emit (boost::bind (boost::ref (Finished)));
+		}
 	}
 }
 
@@ -184,6 +211,10 @@ Job::set_progress (float p)
 	_progress_unknown = false;
 	_stack.back().normalised = p;
 	boost::this_thread::interruption_point ();
+
+	if (paused ()) {
+		dcpomatic_sleep (1);
+	}
 }
 
 /** @return fractional overall progress, or -1 if not known */
@@ -320,3 +351,19 @@ Job::cancel ()
 	_thread->interrupt ();
 	_thread->join ();
 }
+
+void
+Job::pause ()
+{
+	if (running ()) {
+		set_state (PAUSED);
+	}
+}
+
+void
+Job::resume ()
+{
+	if (paused ()) {
+		set_state (RUNNING);
+	}
+}