Allow specification of video bit rate separately for J2K and MPEG2.

[dcpomatic.git] / src / lib / hints.cc

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index bbd5ae5d594e5a3b1b81ac4f3ad1ab7bb4ba10ae..8e678fdf15987916c48f48593d9a9b1680d28c0a 100644 (file)
--- 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>
@@ -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.")
+                               )
+                   );
        }
 }
 
@@ -161,10 +173,10 @@ Hints::check_unusual_container ()
 
 
 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 ();
@@ -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 */