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 18df40878f8feafae345fa64786be06d51e0ecaf..8924fa09c49fcdd09cef5637f5e27496de564f0e 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -34,6 +34,7 @@
 
 using std::string;
 using std::list;
+using std::cout;
 using std::stringstream;
 using boost::shared_ptr;
 
@@ -43,6 +44,7 @@ Job::Job (shared_ptr<const Film> f)
        , _state (NEW)
        , _start_time (0)
        , _progress_unknown (false)
+       , _last_set (0)
        , _ran_for (0)
 {
        descend (1);
@@ -104,7 +106,7 @@ Job::run_wrapper ()
                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 DCP-o-matic mailing list (dcpomatic@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 (...) {
@@ -113,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 DCP-o-matic mailing list (dcpomatic@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)")
                        );
 
        }
@@ -179,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 */
@@ -207,6 +215,13 @@ 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;