Some boost::filesystem::path cleanups; tweak for changes to libdcp.

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

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 8bb43a91f28bc3c5acbe207c3b61a6433b013518..8924fa09c49fcdd09cef5637f5e27496de564f0e 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -28,22 +28,23 @@
 #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);
@@ -85,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 (...) {
@@ -104,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)")
                        );
 
        }
@@ -170,15 +181,21 @@ Job::paused () const
 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 ();
-               if (ui_signaller) {
-                       ui_signaller->emit (boost::bind (boost::ref (Finished)));
+               if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) {
+                       _ran_for = elapsed_time ();
+                       finished = true;
                }
        }
+
+       if (finished && ui_signaller) {
+               ui_signaller->emit (boost::bind (boost::ref (Finished)));
+       }
 }
 
 /** @return Time (in seconds) that this job has been running */
@@ -198,13 +215,24 @@ 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 ()) {
-               dvdomatic_sleep (1);
+               dcpomatic_sleep (1);
+       }
+
+       if (ui_signaller) {
+               ui_signaller->emit (boost::bind (boost::ref (Progress)));
        }
 }