Basics of job view when sending KDM emails from dcpomatic_kdm.

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

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index 36c9eb6c8e54f4ddefc311a19b5620d124c58a04..e15263670059eb72ab496d8ead51e0d16dd954ff 100644 (file)
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -109,8 +109,8 @@ HintsDialog::film_changed ()
 
        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") {
@@ -146,8 +146,8 @@ HintsDialog::film_changed ()
        }
 
        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 +159,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 ();