Fix a couple of logging things.

[dcpomatic.git] / src / lib / job.cc

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 812380594ec0ea247661951d93909773fbce2201..e63ea6dc8e16776099580cb3740a5b46c7061d0b 100644 (file)
--- 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)
@@ -81,10 +84,20 @@ 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);
@@ -153,17 +166,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)));
        }
 }
 
@@ -188,6 +217,14 @@ Job::set_progress (float p)
        _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 */
@@ -324,3 +361,19 @@ Job::cancel ()
        _thread->interrupt ();
        _thread->join ();
 }
+
+void
+Job::pause ()
+{
+       if (running ()) {
+               set_state (PAUSED);
+       }
+}
+
+void
+Job::resume ()
+{
+       if (paused ()) {
+               set_state (RUNNING);
+       }
+}