X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscode_job.cc;h=1db37e3708b27748ada7455763a2c753e63e30f6;hb=26a4298fcd173a59dc94094df6058e7e96dfa786;hp=420f5a8d219240ed726e617c9cab49febae7a9a5;hpb=d8ea1796f34ff894b148a0af78c0a547e0496ee1;p=dcpomatic.git

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 420f5a8d2..1db37e370 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -29,21 +29,20 @@
 #include "film.h"
 #include "encoder.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "compose.hpp"
+#include "analytics.h"
 #include <iostream>
 #include <iomanip>
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-#define LOG_ERROR_NC(...)   _film->log()->log (__VA_ARGS__, LogEntry::TYPE_ERROR);
-
 using std::string;
 using std::fixed;
 using std::setprecision;
 using std::cout;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 /** @param film Film to use */
 TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
@@ -55,7 +54,7 @@ TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
 string
 TranscodeJob::name () const
 {
-	return String::compose (_("Transcode %1"), _film->name());
+	return String::compose (_("Transcoding %1"), _film->name());
 }
 
 string
@@ -92,14 +91,19 @@ TranscodeJob::run ()
 		}
 
 		LOG_GENERAL (N_("Transcode job completed successfully: %1 fps"), fps);
-		_encoder.reset ();
+
+		if (dynamic_pointer_cast<DCPEncoder>(_encoder)) {
+			Analytics::instance()->successful_dcp_encode();
+		}
 
 		/* XXX: this shouldn't be here */
-		if (_film->upload_after_make_dcp ()) {
+		if (_film->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
 			shared_ptr<Job> job (new UploadJob (_film));
 			JobManager::instance()->add (job);
 		}
 
+		_encoder.reset ();
+
 	} catch (...) {
 		_encoder.reset ();
 		throw;