Merge master.

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

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 9a5812fa7426dfb451fb619951b606769be16e06..2e6385d62e8499a37ed427fb3650c1e22aec5196 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -35,8 +35,6 @@ using std::list;
 using std::stringstream;
 using boost::shared_ptr;
 
-/** @param s Film that we are operating on.
- */
 Job::Job (shared_ptr<Film> f)
        : _film (f)
        , _thread (0)
@@ -94,7 +92,7 @@ Job::run_wrapper ()
                set_state (FINISHED_ERROR);
                set_error (
                        e.what (),
-                       _("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
+                       _("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)")
                        );
 
        } catch (...) {
@@ -103,7 +101,7 @@ Job::run_wrapper ()
                set_state (FINISHED_ERROR);
                set_error (
                        _("Unknown error"),
-                       _("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
+                       _("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)")
                        );
 
        }
@@ -200,7 +198,7 @@ Job::set_progress (float p)
        boost::this_thread::interruption_point ();
 
        if (paused ()) {
-               dvdomatic_sleep (1);
+               dcpomatic_sleep (1);
        }
 }