#include "types.h"
#include "compose.hpp"
#include "dcpomatic_assert.h"
+#include "warnings.h"
#include <dcp/raw_convert.h>
#include <dcp/cpl.h>
#include <dcp/dcp.h>
-#include <dcp/reel_mxf.h>
+#include <dcp/reel_file_asset.h>
#include <dcp/reel_asset.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <libcxml/cxml.h>
-#include <boost/foreach.hpp>
#include "i18n.h"
using std::max;
using std::min;
using std::string;
-using boost::shared_ptr;
+using std::list;
+using std::shared_ptr;
+using std::vector;
using dcp::raw_convert;
bool operator== (Crop const & a, Crop const & b)
resolution_to_string (Resolution r)
{
switch (r) {
- case RESOLUTION_2K:
+ case Resolution::TWO_K:
return "2K";
- case RESOLUTION_4K:
+ case Resolution::FOUR_K:
return "4K";
}
string_to_resolution (string s)
{
if (s == "2K") {
- return RESOLUTION_2K;
+ return Resolution::TWO_K;
}
if (s == "4K") {
- return RESOLUTION_4K;
+ return Resolution::FOUR_K;
}
DCPOMATIC_ASSERT (false);
- return RESOLUTION_2K;
+ return Resolution::TWO_K;
}
Crop::Crop (shared_ptr<cxml::Node> node)
string_to_text_type (string s)
{
if (s == "unknown") {
- return TEXT_UNKNOWN;
+ return TextType::UNKNOWN;
} else if (s == "open-subtitle") {
- return TEXT_OPEN_SUBTITLE;
+ return TextType::OPEN_SUBTITLE;
} else if (s == "closed-caption") {
- return TEXT_CLOSED_CAPTION;
+ return TextType::CLOSED_CAPTION;
} else {
throw MetadataError (String::compose ("Unknown text type %1", s));
}
text_type_to_string (TextType t)
{
switch (t) {
- case TEXT_UNKNOWN:
+ case TextType::UNKNOWN:
return "unknown";
- case TEXT_OPEN_SUBTITLE:
+ case TextType::OPEN_SUBTITLE:
return "open-subtitle";
- case TEXT_CLOSED_CAPTION:
+ case TextType::CLOSED_CAPTION:
return "closed-caption";
default:
DCPOMATIC_ASSERT (false);
text_type_to_name (TextType t)
{
switch (t) {
- case TEXT_UNKNOWN:
+ case TextType::UNKNOWN:
return _("Timed text");
- case TEXT_OPEN_SUBTITLE:
+ case TextType::OPEN_SUBTITLE:
return _("Open subtitles");
- case TEXT_CLOSED_CAPTION:
+ case TextType::CLOSED_CAPTION:
return _("Closed captions");
default:
DCPOMATIC_ASSERT (false);
video_frame_type_to_string (VideoFrameType t)
{
switch (t) {
- case VIDEO_FRAME_TYPE_2D:
+ case VideoFrameType::TWO_D:
return "2d";
- case VIDEO_FRAME_TYPE_3D:
+ case VideoFrameType::THREE_D:
return "3d";
- case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+ case VideoFrameType::THREE_D_LEFT_RIGHT:
return "3d-left-right";
- case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+ case VideoFrameType::THREE_D_TOP_BOTTOM:
return "3d-top-bottom";
- case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+ case VideoFrameType::THREE_D_ALTERNATE:
return "3d-alternate";
- case VIDEO_FRAME_TYPE_3D_LEFT:
+ case VideoFrameType::THREE_D_LEFT:
return "3d-left";
- case VIDEO_FRAME_TYPE_3D_RIGHT:
+ case VideoFrameType::THREE_D_RIGHT:
return "3d-right";
default:
DCPOMATIC_ASSERT (false);
string_to_video_frame_type (string s)
{
if (s == "2d") {
- return VIDEO_FRAME_TYPE_2D;
+ return VideoFrameType::TWO_D;
} else if (s == "3d") {
- return VIDEO_FRAME_TYPE_3D;
+ return VideoFrameType::THREE_D;
} else if (s == "3d-left-right") {
- return VIDEO_FRAME_TYPE_3D_LEFT_RIGHT;
+ return VideoFrameType::THREE_D_LEFT_RIGHT;
} else if (s == "3d-top-bottom") {
- return VIDEO_FRAME_TYPE_3D_TOP_BOTTOM;
+ return VideoFrameType::THREE_D_TOP_BOTTOM;
} else if (s == "3d-alternate") {
- return VIDEO_FRAME_TYPE_3D_ALTERNATE;
+ return VideoFrameType::THREE_D_ALTERNATE;
} else if (s == "3d-left") {
- return VIDEO_FRAME_TYPE_3D_LEFT;
+ return VideoFrameType::THREE_D_LEFT;
} else if (s == "3d-right") {
- return VIDEO_FRAME_TYPE_3D_RIGHT;
+ return VideoFrameType::THREE_D_RIGHT;
}
DCPOMATIC_ASSERT (false);
: dcp_directory (p.leaf().string())
{
dcp::DCP dcp (p);
- dcp.read ();
+
+ vector<dcp::VerificationNote> notes;
+ dcp.read (¬es);
+ for (auto i: notes) {
+ if (i.code() != dcp::VerificationNote::Code::EXTERNAL_ASSET) {
+ /* It's not just a warning about this DCP being a VF */
+ throw dcp::ReadError(dcp::note_to_string(i));
+ }
+ }
cpl_id = dcp.cpls().front()->id();
cpl_annotation_text = dcp.cpls().front()->annotation_text();
cpl_file = dcp.cpls().front()->file().get();
encrypted = false;
- BOOST_FOREACH (shared_ptr<dcp::CPL> j, dcp.cpls()) {
- BOOST_FOREACH (shared_ptr<const dcp::ReelAsset> k, j->reel_assets()) {
- shared_ptr<const dcp::ReelMXF> mxf = boost::dynamic_pointer_cast<const dcp::ReelMXF> (k);
- if (mxf && mxf->key_id()) {
+ for (auto j: dcp.cpls()) {
+ for (auto k: j->reel_file_assets()) {
+ if (k->encrypted()) {
encrypted = true;
}
}
}
- last_write_time = boost::filesystem::last_write_time (p);
+ boost::system::error_code ec;
+ auto last_write = boost::filesystem::last_write_time (p, ec);
+ last_write_time = ec ? 0 : last_write;
+}
+
+
+bool operator== (NamedChannel const& a, NamedChannel const& b)
+{
+ return a.name == b.name && a.index == b.index;
+}
+
+
+string
+video_range_to_string (VideoRange r)
+{
+ switch (r) {
+ case VideoRange::FULL:
+ return "full";
+ case VideoRange::VIDEO:
+ return "video";
+ default:
+ DCPOMATIC_ASSERT (false);
+ }
+}
+
+
+VideoRange
+string_to_video_range (string s)
+{
+ if (s == "full") {
+ return VideoRange::FULL;
+ } else if (s == "video") {
+ return VideoRange::VIDEO;
+ }
+
+ DCPOMATIC_ASSERT (false);
+ return VideoRange::FULL;
}
+
projects / dcpomatic.git / blobdiff