X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_view.cc;h=5a6484f0a3a237e7b62b106efed24df9d1dcf6d0;hb=34eb57979b5293ac3b864310f8fc8c77c26343e2;hp=231176e4fd96c773d1f96a779de648647f0ddf3a;hpb=6485b4cb7afb020a8a4e8ff1a5b36544d25595a8;p=dcpomatic.git

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 231176e4f..5a6484f0a 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -19,28 +19,30 @@
 */
 
 
+#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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 
 
-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> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
@@ -103,8 +105,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 ();
+		}
 	}
 }
 
@@ -156,7 +161,7 @@ JobView::finished ()
 		d->Destroy ();
 	}
 
-	if ((dynamic_pointer_cast<TranscodeJob>(_job) || dynamic_pointer_cast<AnalyseAudioJob>(_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);
 		}