Use boost::signals2; fix bugs with x-thread signalling.

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

diff --git a/src/lib/job.cc b/src/lib/job.cc
index f3d7deac02a4c5426674b0765083c3c8dbc55b6d..c5a254a2a60b5829f742e10cd784642108907eb2 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -27,8 +27,10 @@
 #include "job.h"
 #include "util.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::list;
+using std::stringstream;
+using boost::shared_ptr;
 
 /** @param s Film that we are operating on.
  */
@@ -64,7 +66,7 @@ Job::run_wrapper ()
                
                set_progress (1);
                set_state (FINISHED_ERROR);
-               set_error (String::compose ("%1 (%2)", e.what(), filesystem::path (e.filename()).leaf()));
+               set_error (String::compose ("%1 (%2)", e.what(), boost::filesystem::path (e.filename()).leaf()));
                
        } catch (std::exception& e) {
 
@@ -125,20 +127,10 @@ Job::set_state (State s)
 
        if (_state == FINISHED_OK || _state == FINISHED_ERROR) {
                _ran_for = elapsed_time ();
+               Finished ();
        }
 }
 
-/** A hack to work around our lack of cross-thread
- *  signalling; this emits Finished, and listeners
- *  assume that it will be emitted in the GUI thread,
- *  so this method must be called from the GUI thread.
- */
-void
-Job::emit_finished ()
-{
-       Finished ();
-}
-
 /** @return Time (in seconds) that this job has been running */
 int
 Job::elapsed_time () const