X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_view.cc;h=fe42f4be36f6f6f911c8b01a558c2d228f111622;hb=313319ba2d8544bc25524e02e634804a503b54f1;hp=2754948ae609c0c2283f903714946649f180d673;hpb=7cd939aa3d0b87858c74e5832d1aa812b2271459;p=dcpomatic.git diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc index 2754948ae..fe42f4be3 100644 --- a/src/wx/job_view.cc +++ b/src/wx/job_view.cc @@ -19,28 +19,27 @@ */ +#include "check_box.h" +#include "dcpomatic_button.h" #include "job_view.h" -#include "wx_util.h" #include "message_dialog.h" #include "static_text.h" -#include "check_box.h" -#include "dcpomatic_button.h" -#include "lib/job.h" -#include "lib/job_manager.h" +#include "wx_util.h" +#include "lib/analyse_audio_job.h" #include "lib/compose.hpp" #include "lib/config.h" +#include "lib/job.h" +#include "lib/job_manager.h" #include "lib/send_notification_email_job.h" #include "lib/transcode_job.h" -#include "lib/analyse_audio_job.h" #include #include -using std::string; using std::min; using std::shared_ptr; +using std::string; using boost::bind; -using std::dynamic_pointer_cast; JobView::JobView (shared_ptr job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table) @@ -103,8 +102,11 @@ JobView::setup () void JobView::maybe_pulse () { - if (_gauge && _job->running() && !_job->progress()) { - _gauge->Pulse (); + if (_gauge && _job->running()) { + auto elapsed = _job->seconds_since_last_progress_update(); + if (!_job->progress() || !elapsed || *elapsed > 2) { + _gauge->Pulse (); + } } } @@ -151,12 +153,12 @@ JobView::finished () } if (_job->message()) { - MessageDialog* d = new MessageDialog (_parent, _job->name(), _job->message().get()); + auto d = new MessageDialog (_parent, std_to_wx(_job->name()), std_to_wx(_job->message().get())); d->ShowModal (); d->Destroy (); } - if ((dynamic_pointer_cast(_job) || dynamic_pointer_cast(_job)) && _notify->GetValue()) { + if (_job->enable_notify() && _notify->GetValue()) { if (Config::instance()->notification(Config::MESSAGE_BOX)) { wxMessageBox (std_to_wx(_job->name() + ": " + _job->status()), _("DCP-o-matic"), wxICON_INFORMATION); }