Merge.

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

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 76976df322c1c3778bcac915709ea39a871f5d68..e48daa4109bbfb935fdc1f532a0d6947c9a276f9 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -23,7 +23,7 @@
 
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/exceptions.h>
+#include <dcp/exceptions.h>
 #include "job.h"
 #include "util.h"
 #include "cross.h"
@@ -66,7 +66,7 @@ Job::run_wrapper ()
 
                run ();
 
-       } catch (libdcp::FileError& e) {
+       } catch (dcp::FileError& e) {
                
                string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
 
@@ -187,7 +187,7 @@ void
 Job::set_state (State s)
 {
        bool finished = false;
-       
+
        {
                boost::mutex::scoped_lock lm (_state_mutex);
                _state = s;
@@ -201,10 +201,10 @@ Job::set_state (State s)
 
        if (finished && ui_signaller) {
                ui_signaller->emit (boost::bind (boost::ref (Finished)));
-       }
+       }       
 }
 
-/** @return Time (in seconds) that this sub-job has been running */
+/** @return DCPTime (in seconds) that this sub-job has been running */
 int
 Job::elapsed_time () const
 {