Fix build.

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

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 05a90524c9818615112b77464da5a56bd154ec69..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,10 +66,7 @@ Job::run_wrapper ()
 
                run ();
 
-       } catch (libdcp::FileError& e) {
-               
-               set_progress (1);
-               set_state (FINISHED_ERROR);
+       } catch (dcp::FileError& e) {
                
                string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
 
@@ -84,39 +81,48 @@ Job::run_wrapper ()
                }
 
                set_error (e.what(), m);
-
-       } catch (OpenFileError& e) {
-
                set_progress (1);
                set_state (FINISHED_ERROR);
+               
+       } catch (OpenFileError& e) {
 
                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())
                        );
 
+               set_progress (1);
+               set_state (FINISHED_ERROR);
+
        } catch (boost::thread_interrupted &) {
 
                set_state (FINISHED_CANCELLED);
-               
-       } catch (std::exception& e) {
 
+       } catch (std::bad_alloc& e) {
+
+               set_error (_("Out of memory"), _("There was not enough memory to do this."));
                set_progress (1);
                set_state (FINISHED_ERROR);
+               
+       } catch (std::exception& e) {
+
                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 (carl@dcpomatic.com)")
                        );
 
-       } catch (...) {
-
                set_progress (1);
                set_state (FINISHED_ERROR);
+               
+       } catch (...) {
+
                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 (carl@dcpomatic.com)")
                        );
 
+               set_progress (1);
+               set_state (FINISHED_ERROR);
        }
 }
 
@@ -181,7 +187,7 @@ void
 Job::set_state (State s)
 {
        bool finished = false;
-       
+
        {
                boost::mutex::scoped_lock lm (_state_mutex);
                _state = s;
@@ -195,7 +201,7 @@ Job::set_state (State s)
 
        if (finished && ui_signaller) {
                ui_signaller->emit (boost::bind (boost::ref (Finished)));
-       }
+       }       
 }
 
 /** @return DCPTime (in seconds) that this sub-job has been running */
@@ -233,7 +239,7 @@ Job::set_progress (float p, bool force)
        }
 }
 
-/** @return fractional progress of this sub-job, or -1 if not known */
+/** @return fractional progress of the current sub-job, or -1 if not known */
 float
 Job::progress () const
 {
@@ -319,6 +325,29 @@ Job::status () const
        return s.str ();
 }
 
+string
+Job::json_status () const
+{
+       boost::mutex::scoped_lock lm (_state_mutex);
+
+       switch (_state) {
+       case NEW:
+               return N_("new");
+       case RUNNING:
+               return N_("running");
+       case PAUSED:
+               return N_("paused");
+       case FINISHED_OK:
+               return N_("finished_ok");
+       case FINISHED_ERROR:
+               return N_("finished_error");
+       case FINISHED_CANCELLED:
+               return N_("finished_cancelled");
+       }
+
+       return "";
+}
+
 /** @return An estimate of the remaining time for this sub-job, in seconds */
 int
 Job::remaining_time () const