Fix broken content remove button.

[dcpomatic.git] / src / wx / hints_dialog.cc

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index 36c9eb6c8e54f4ddefc311a19b5620d124c58a04..2cf109e5512a944f2c05293e348a4378b2b2bb6e 100644 (file)
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -28,6 +28,7 @@
 #include <boost/foreach.hpp>
 
 using boost::shared_ptr;
+using boost::optional;
 using boost::dynamic_pointer_cast;
 
 HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film)
@@ -79,8 +80,11 @@ HintsDialog::film_changed ()
                        shared_ptr<SubtitleContent> s = dynamic_pointer_cast<SubtitleContent> (i);
                        if (s) {
                                BOOST_FOREACH (shared_ptr<Font> j, s->fonts ()) {
-                                       if (j->file() && boost::filesystem::file_size (j->file().get ()) >= (640 * 1024)) {
-                                               big_font_files = true;
+                                       for (int i = 0; i < FontFiles::VARIANTS; ++i) {
+                                               optional<boost::filesystem::path> const p = j->file (static_cast<FontFiles::Variant> (i));
+                                               if (p && boost::filesystem::file_size (p.get()) >= (640 * 1024)) {
+                                                       big_font_files = true;
+                                               }
                                        }
                                }
                        }
@@ -92,25 +96,16 @@ HintsDialog::film_changed ()
                _text->WriteText (_("You have specified a font file which is larger than 640kB.  This is very likely to cause problems on playback."));
        }
 
-       if (film->audio_channels() % 2) {
-               hint = true;
-               _text->WriteText (_("Your DCP has an odd number of audio channels.  This is very likely to cause problems on playback."));
-               _text->Newline ();
-       } else if (film->audio_channels() < 6) {
+       if (film->audio_channels() < 6) {
                hint = true;
                _text->WriteText (_("Your DCP has fewer than 6 audio channels.  This may cause problems on some projectors."));
                _text->Newline ();
-       } else if (film->audio_channels() == 0) {
-               /* Carsten Kurz reckons having no audio can be a problem */
-               hint = true;
-               _text->WriteText (_("Your DCP has no audio channels.  This is likely to cause problems on playback."));
-               _text->Newline ();
        }
 
        int flat_or_narrower = 0;
        int scope = 0;
-       for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) {
-               shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
+       BOOST_FOREACH (shared_ptr<const Content> i, content) {
+               shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (i);
                if (vc) {
                        Ratio const * r = vc->scale().ratio ();
                        if (r && r->id() == "239") {
@@ -145,9 +140,15 @@ HintsDialog::film_changed ()
                _text->Newline ();
        }
 
+       if (film->interop() && film->video_frame_rate() != 24 && film->video_frame_rate() != 48) {
+               hint = true;
+               _text->WriteText (_("You are set up for an Interop DCP at a frame rate which is not officially supported.  You are advised to make a SMPTE DCP instead."));
+               _text->Newline ();
+       }
+
        int vob = 0;
-       for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) {
-               if (boost::algorithm::starts_with ((*i)->path(0).filename().string(), "VTS_")) {
+       BOOST_FOREACH (shared_ptr<const Content> i, content) {
+               if (boost::algorithm::starts_with (i->path(0).filename().string(), "VTS_")) {
                        ++vob;
                }
        }
@@ -159,14 +160,14 @@ HintsDialog::film_changed ()
        }
 
        int three_d = 0;
-       for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) {
-               shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
+       BOOST_FOREACH (shared_ptr<const Content> i, content) {
+               shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (i);
                if (vc && vc->video_frame_type() != VIDEO_FRAME_TYPE_2D) {
                        ++three_d;
                }
        }
 
-       if (three_d > 0) {
+       if (three_d > 0 && !film->three_d()) {
                hint = true;
                _text->WriteText (_("You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"));
                _text->Newline ();