X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fhints.cc;h=46296351be71e899a6ffdbc4a29972d9c3e52309;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=f21c51db9e8f42b5f358e9ba94e3443a9033482b;hpb=9bfa07293928c371d59db2091ba2b7e715ce5994;p=dcpomatic.git

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index f21c51db9..46296351b 100644
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,18 +23,18 @@
 #include "audio_content.h"
 #include "audio_processor.h"
 #include "compose.hpp"
+#include "config.h"
 #include "content.h"
 #include "cross.h"
 #include "dcp_content_type.h"
 #include "film.h"
 #include "font.h"
-#include "font_data.h"
 #include "hints.h"
+#include "maths_util.h"
 #include "player.h"
 #include "ratio.h"
 #include "text_content.h"
 #include "types.h"
-#include "util.h"
 #include "video_content.h"
 #include "writer.h"
 #include <dcp/cpl.h>
@@ -51,11 +51,8 @@
 using std::cout;
 using std::make_shared;
 using std::max;
-using std::min;
-using std::pair;
 using std::shared_ptr;
 using std::string;
-using std::vector;
 using std::weak_ptr;
 using boost::optional;
 using boost::bind;
@@ -384,6 +381,7 @@ try
 
 	auto content = film->content ();
 
+	check_certificates ();
 	check_interop ();
 	check_big_font_files ();
 	check_few_audio_channels ();
@@ -408,9 +406,9 @@ try
 		emit (bind(boost::ref(Progress), _("Examining audio, subtitles and closed captions")));
 	}
 
-	auto player = make_shared<Player>(film, false);
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
 	player->set_ignore_video ();
-	if (check_loudness_done) {
+	if (check_loudness_done || _disable_audio_analysis) {
 		/* We don't need to analyse audio because we already loaded a suitable analysis */
 		player->set_ignore_audio ();
 	}
@@ -420,6 +418,8 @@ try
 	struct timeval last_pulse;
 	gettimeofday (&last_pulse, 0);
 
+	_writer->write (player->get_subtitle_fonts());
+
 	while (!player->pass()) {
 
 		struct timeval now;
@@ -439,7 +439,6 @@ try
 		check_loudness ();
 	}
 
-	_writer->write (player->get_subtitle_fonts());
 
 	if (_long_subtitle && !_very_long_subtitle) {
 		hint (_("At least one of your subtitle lines has more than 52 characters.  It is recommended to make each line 52 characters at most in length."));
@@ -655,3 +654,31 @@ Hints::check_audio_language ()
 	}
 }
 
+
+void
+Hints::check_certificates ()
+{
+	auto bad = Config::instance()->check_certificates();
+	if (!bad) {
+		return;
+	}
+
+	switch (*bad) {
+	case Config::BAD_SIGNER_UTF8_STRINGS:
+		hint(_("The certificate chain that DCP-o-matic uses for signing DCPs and KDMs contains a small error "
+		       "which will prevent DCPs from being validated correctly on some systems.  You are advised to "
+		       "re-create the signing certificate chain by clicking the \"Re-make certificates and key...\" "
+		       "button in the Keys page of Preferences."));
+		break;
+	case Config::BAD_SIGNER_VALIDITY_TOO_LONG:
+		hint(_("The certificate chain that DCP-o-matic uses for signing DCPs and KDMs has a validity period "
+		       "that is too long.  This will cause problems playing back DCPs on some systems. "
+		       "You are advised to re-create the signing certificate chain by clicking the "
+		       "\"Re-make certificates and key...\" button in the Keys page of Preferences."));
+		break;
+	default:
+		/* Some bad situations can't happen here as DCP-o-matic would have refused to start until they are fixed */
+		break;
+	}
+}
+