Manual tweaks.

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

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 7301e537393e43eb1097cb806f6506b87727754c..cc636b0bfb0d5bd40965935aa31296ad114cdcc7 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -28,6 +28,7 @@
 #include "overlaps.h"
 #include "compose.hpp"
 #include "dcp_decoder.h"
+#include "log.h"
 #include "text_content.h"
 #include <dcp/dcp.h>
 #include <dcp/raw_convert.h>
@@ -63,6 +64,8 @@ int const DCPContentProperty::NAME               = 605;
 int const DCPContentProperty::TEXTS              = 606;
 int const DCPContentProperty::CPL                = 607;
 
+#define LOG_GENERAL(...) this->film()->log()->log(String::compose(__VA_ARGS__), LogEntry::TYPE_GENERAL);
+
 DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p)
        : Content (film)
        , _encrypted (false)
@@ -72,6 +75,8 @@ DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p)
        , _reference_audio (false)
        , _three_d (false)
 {
+       LOG_GENERAL ("Creating DCP content from %1", p.string());
+
        read_directory (p);
        set_default_colour_conversion ();
 
@@ -147,13 +152,27 @@ DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, in
 void
 DCPContent::read_directory (boost::filesystem::path p)
 {
+       LOG_GENERAL ("DCPContent::read_directory reads %1", p.string());
        for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
                if (boost::filesystem::is_regular_file (i->path())) {
+                       LOG_GENERAL ("Inside there's regular file %1", i->path().string());
                        add_path (i->path());
                } else if (boost::filesystem::is_directory (i->path ())) {
+                       LOG_GENERAL ("Inside there's directory %1", i->path().string());
                        read_directory (i->path());
                }
        }
+
+       bool have_assetmap = false;
+       BOOST_FOREACH (boost::filesystem::path i, paths()) {
+               if (i.filename() == "ASSETMAP" || i.filename() == "ASSETMAP.xml") {
+                       have_assetmap = true;
+               }
+       }
+
+       if (!have_assetmap) {
+               throw DCPError ("No ASSETMAP or ASSETMAP.xml file found: is this a DCP?");
+       }
 }
 
 void
@@ -559,7 +578,21 @@ DCPContent::can_reference_video (string& why_not) const
                return false;
        }
 
-       if (film()->frame_size() != video->size()) {
+       Resolution video_res = RESOLUTION_2K;
+       if (video->size().width > 2048 || video->size().height > 1080) {
+               video_res = RESOLUTION_4K;
+       }
+
+       if (film()->resolution() != video_res) {
+               if (video_res == RESOLUTION_4K) {
+                       /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
+                       why_not = _("it is 4K and the film is 2K.");
+               } else {
+                       /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
+                       why_not = _("it is 2K and the film is 4K.");
+               }
+               return false;
+       } else if (film()->frame_size() != video->size()) {
                /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
                why_not = _("its video frame size differs from the film's.");
                return false;