1 files changed, 34 insertions, 18 deletions

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index 2e2a8fd7b..e7a393103 100644
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -35,6 +35,7 @@
 #include "player.h"
 #include "ratio.h"
 #include "text_content.h"
+#include "variant.h"
 #include "video_content.h"
 #include "writer.h"
 #include <dcp/cpl.h>
@@ -76,7 +77,7 @@ using namespace boost::placeholders;
 
 Hints::Hints (weak_ptr<const Film> weak_film)
 	: WeakConstFilm (weak_film)
-	, _writer (new Writer(weak_film, weak_ptr<Job>(), true))
+	, _writer(new Writer(weak_film, weak_ptr<Job>(), film()->dir("hints") / dcpomatic::get_process_id(), true))
 	, _analyser (film(), film()->playlist(), true, [](float) {})
 	, _stop (false)
 {
@@ -107,7 +108,13 @@ void
 Hints::check_few_audio_channels ()
 {
 	if (film()->audio_channels() < 6) {
-		hint (_("Your DCP has fewer than 6 audio channels.  This may cause problems on some projectors.  You may want to set the DCP to have 6 channels.  It does not matter if your content has fewer channels, as DCP-o-matic will fill the extras with silence."));
+		hint(
+			variant::insert_dcpomatic(
+				_("Your DCP has fewer than 6 audio channels.  This may cause problems on some projectors.  "
+				  "You may want to set the DCP to have 6 channels.  It does not matter if your content has "
+				  "fewer channels, as %1 will fill the extras with silence.")
+				)
+		    );
 	}
 }
 
@@ -117,7 +124,12 @@ Hints::check_upmixers ()
 {
 	auto ap = film()->audio_processor();
 	if (ap && (ap->id() == "stereo-5.1-upmix-a" || ap->id() == "stereo-5.1-upmix-b")) {
-		hint (_("You are using DCP-o-matic's stereo-to-5.1 upmixer.  This is experimental and may result in poor-quality audio.  If you continue, you should listen to the resulting DCP in a cinema to make sure that it sounds good."));
+		hint(variant::insert_dcpomatic(
+				_("You are using %1's stereo-to-5.1 upmixer.  This is experimental and "
+				  "may result in poor-quality audio.  If you continue, you should listen to the "
+				  "resulting DCP in a cinema to make sure that it sounds good.")
+				)
+		    );
 	}
 }
 
@@ -154,17 +166,17 @@ void
 Hints::check_unusual_container ()
 {
 	auto const film_container = film()->container()->id();
-	if (film_container != "185" && film_container != "239") {
+	if (film()->video_encoding() != VideoEncoding::MPEG2 && film_container != "185" && film_container != "239") {
 		hint (_("Your DCP uses an unusual container ratio.  This may cause problems on some projectors.  If possible, use Flat or Scope for the DCP container ratio."));
 	}
 }
 
 
 void
-Hints::check_high_j2k_bandwidth ()
+Hints::check_high_video_bit_rate()
 {
-	if (film()->j2k_bandwidth() >= 245000000) {
-		hint (_("A few projectors have problems playing back very high bit-rate DCPs.  It is a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is unlikely to have any visible effect on the image."));
+	if (film()->video_encoding() == VideoEncoding::JPEG2000 && film()->video_bit_rate(VideoEncoding::JPEG2000) >= 245000000) {
+		hint (_("A few projectors have problems playing back very high bit-rate DCPs.  It is a good idea to drop the video bit rate down to about 200Mbit/s; this is unlikely to have any visible effect on the image."));
 	}
 }
 
@@ -456,7 +468,7 @@ try
 	check_upmixers ();
 	check_incorrect_container ();
 	check_unusual_container ();
-	check_high_j2k_bandwidth ();
+	check_high_video_bit_rate();
 	check_frame_rate ();
 	check_4k_3d ();
 	check_speed_up ();
@@ -483,7 +495,7 @@ try
 	auto dcp_dir = film->dir("hints") / dcpomatic::get_process_id();
 	dcp::filesystem::remove_all(dcp_dir);
 
-	_writer->finish (film->dir("hints") / dcpomatic::get_process_id());
+	_writer->finish();
 
 	dcp::DCP dcp (dcp_dir);
 	dcp.read ();
@@ -718,16 +730,20 @@ Hints::check_certificates ()
 
 	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.  It is advisable to "
-		       "re-create the signing certificate chain by clicking the \"Re-make certificates and key...\" "
-		       "button in the Keys page of Preferences."));
+		hint(variant::insert_dcpomatic(
+				_("The certificate chain that %1 uses for signing DCPs and KDMs contains a small error "
+				  "which will prevent DCPs from being validated correctly on some systems.  It is advisable 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. "
-		       "It is advisable to re-create the signing certificate chain by clicking the "
-		       "\"Re-make certificates and key...\" button in the Keys page of Preferences."));
+		hint(variant::insert_dcpomatic(
+				_("The certificate chain that %1 uses for signing DCPs and KDMs has a validity period "
+				  "that is too long.  This will cause problems playing back DCPs on some systems. "
+				  "It is advisable 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 */
@@ -740,7 +756,7 @@ void
 Hints::check_8_or_16_audio_channels()
 {
 	auto const channels = film()->audio_channels();
-	if (channels != 8 && channels != 16) {
+	if (film()->video_encoding() != VideoEncoding::MPEG2 && channels != 8 && channels != 16) {
 		hint(String::compose(_("Your DCP has %1 audio channels, rather than 8 or 16.  This may cause some distributors to raise QC errors when they check your DCP.  To avoid this, set the DCP audio channels to 8 or 16."), channels));
 	}
 }