Extract all uses of DCP-o-matic name to allow branding.

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

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 727456523ca39e7e58f1045fa4df1aea3095d291..94c23aac68d2621c40c69b055d541dccda95cf6f 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -33,6 +33,7 @@
 #include "job.h"
 #include "log.h"
 #include "util.h"
+#include "variant.h"
 #include <dcp/exceptions.h>
 #include <sub/exceptions.h>
 #include <boost/date_time/posix_time/posix_time.hpp>
@@ -59,6 +60,7 @@ Job::Job (shared_ptr<const Film> film)
        , _state (NEW)
        , _sub_start_time (0)
        , _progress (0)
+       , _rate_limit_progress(true)
 {
 
 }
@@ -111,7 +113,7 @@ Job::run_wrapper ()
 
        } catch (dcp::FileError& e) {
 
-               string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
+               string m = String::compose(_("An error occurred whilst handling the file %1."), e.filename().filename());
 
                try {
                        auto const s = dcp::filesystem::space(e.filename());
@@ -136,9 +138,13 @@ Job::run_wrapper ()
                /* 32-bit */
                set_error (
                        _("Failed to encode the DCP."),
-                       _("This error has probably occurred because you are running the 32-bit version of DCP-o-matic and "
-                         "trying to use too many encoding threads.  Please reduce the 'number of threads DCP-o-matic should "
-                         "use' in the General tab of Preferences and try again.")
+                       String::compose(
+                               _("This error has probably occurred because you are running the 32-bit version of %1 and "
+                                 "trying to use too many encoding threads.  Please reduce the 'number of threads %2 should "
+                                 "use' in the General tab of Preferences and try again."),
+                               variant::dcpomatic(),
+                               variant::dcpomatic()
+                               )
                        );
                done = true;
 #else
@@ -146,7 +152,12 @@ Job::run_wrapper ()
                if (running_32_on_64()) {
                        set_error (
                                _("Failed to encode the DCP."),
-                               _("This error has probably occurred because you are running the 32-bit version of DCP-o-matic.  Please re-install DCP-o-matic with the 64-bit installer and try again.")
+                               String::compose(
+                                       _("This error has probably occurred because you are running the 32-bit version of %1.  "
+                                         "Please re-install %2 with the 64-bit installer and try again."),
+                                       variant::dcpomatic(),
+                                       variant::dcpomatic()
+                                       )
                                );
                        done = true;
                }
@@ -167,8 +178,8 @@ Job::run_wrapper ()
 
                set_error (
                        String::compose (_("Could not open %1"), e.file().string()),
-                       String::compose (
-                               _("DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or is in an unexpected format."),
+                       String::compose(_("%1 could not open the file %2 (%3).  Perhaps it does not exist or is in an unexpected format."),
+                               variant::dcpomatic(),
                                dcp::filesystem::absolute(e.file()).string(),
                                e.what()
                                )
@@ -182,8 +193,8 @@ Job::run_wrapper ()
                if (e.code() == boost::system::errc::no_such_file_or_directory) {
                        set_error (
                                String::compose (_("Could not open %1"), e.path1().string ()),
-                               String::compose (
-                                       _("DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or is in an unexpected format."),
+                               String::compose(_("%1 could not open the file %2 (%3).  Perhaps it does not exist or is in an unexpected format."),
+                                       variant::dcpomatic(),
                                        dcp::filesystem::absolute(e.path1()).string(),
                                        e.what()
                                        )
@@ -241,6 +252,12 @@ Job::run_wrapper ()
                set_progress(1);
                set_state(FINISHED_ERROR);
 
+       } catch (MissingConfigurationError& e) {
+
+               set_error(e.what());
+               set_progress(1);
+               set_state(FINISHED_ERROR);
+
        } catch (std::exception& e) {
 
                set_error (
@@ -432,7 +449,7 @@ Job::set_progress (float p, bool force)
 {
        check_for_interruption_or_pause ();
 
-       if (!force) {
+       if (!force && _rate_limit_progress) {
                /* Check for excessively frequent progress reporting */
                boost::mutex::scoped_lock lm (_progress_mutex);
                struct timeval now;
@@ -655,7 +672,7 @@ void
 Job::cancel ()
 {
        if (_thread.joinable()) {
-               resume();
+               Job::resume();
 
                _thread.interrupt ();
                _thread.join ();
@@ -682,6 +699,7 @@ Job::pause_by_user ()
        }
 
        if (paused) {
+               pause();
                _pause_changed.notify_all ();
        }
 
@@ -694,6 +712,7 @@ Job::pause_by_priority ()
 {
        if (running ()) {
                set_state (PAUSED_BY_PRIORITY);
+               pause();
                _pause_changed.notify_all ();
        }
 }
@@ -735,3 +754,11 @@ Job::set_message (string m)
        boost::mutex::scoped_lock lm (_state_mutex);
        _message = m;
 }
+
+
+void
+Job::set_rate_limit_progress(bool rate_limit)
+{
+       _rate_limit_progress = rate_limit;
+}
+