#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"
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());
void
Job::set_state (State s)
{
- bool const finished = (s == FINISHED_OK || s == FINISHED_ERROR || s == FINISHED_CANCELLED);
-
- /* Do this first, so that we handle things that should happen on finish before the
- * job is actually marked as such. This is important for callers that do:
- *
- * while (JobManager::work_to_do ()) {
- * ui_signaller->ui_idle ();
- * }
- *
- * as otherwise this loop can finish before the Finished handler has been executed
- * (job finishes, calls set_state(), this sets the state and sets a pending signal
- * for Finished, but this is never called as a ui_idle() never happens as work_to_do()
- * is now false).
- */
- if (finished && ui_signaller) {
- ui_signaller->emit (boost::bind (boost::ref (Finished)));
- }
+ bool finished = false;
{
boost::mutex::scoped_lock lm (_state_mutex);
_state = s;
- if (finished) {
+ if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) {
_ran_for = elapsed_time ();
+ finished = true;
_sub_name.clear ();
}
}
+
+ 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
{