X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftypes.cc;h=29e2c387ff05d028c02bce6724b87ff49d85bee7;hb=aeb2f36ede25d6e8ce583592c23bbb1dfb05041e;hp=cbb56e7fe2f0ebbf157523b218ab2590ff04f363;hpb=d927e9b913606f4fc982885c7582ecaf0e3c5a1a;p=libdcp.git

diff --git a/src/types.cc b/src/types.cc
index cbb56e7f..29e2c387 100644
--- a/src/types.cc
+++ b/src/types.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -35,6 +35,8 @@
 #include "types.h"
 #include "exceptions.h"
 #include "compose.hpp"
+#include "dcp_assert.h"
+#include <libxml++/libxml++.h>
 #include <boost/algorithm/string.hpp>
 #include <vector>
 #include <cstdio>
@@ -44,6 +46,22 @@ using namespace std;
 using namespace dcp;
 using namespace boost;
 
+bool dcp::operator== (dcp::Size const & a, dcp::Size const & b)
+{
+	return (a.width == b.width && a.height == b.height);
+}
+
+bool dcp::operator!= (dcp::Size const & a, dcp::Size const & b)
+{
+	return !(a == b);
+}
+
+ostream& dcp::operator<< (ostream& s, dcp::Size const & a)
+{
+	s << a.width << "x" << a.height;
+	return s;
+}
+
 /** Construct a Fraction from a string of the form <numerator> <denominator>
  *  e.g. "1 3".
  */
@@ -121,16 +139,20 @@ Colour::Colour (string argb_hex)
 string
 Colour::to_argb_string () const
 {
-	stringstream s;
-	s << "FF";
-	s << hex
-	  << setw(2) << setfill('0') << r
-	  << setw(2) << setfill('0') << g
-	  << setw(2) << setfill('0') << b;
+	char buffer[9];
+	snprintf (buffer, sizeof(buffer), "FF%02X%02X%02X", r, g, b);
+	return buffer;
+}
 
-	string t = s.str();
-	to_upper (t);
-	return t;
+/** @return An RGB string of the form RRGGBB, where e.g. RR is a two-character
+ *  hex value.
+ */
+string
+Colour::to_rgb_string () const
+{
+	char buffer[7];
+	snprintf (buffer, sizeof(buffer), "%02X%02X%02X", r, g, b);
+	return buffer;
 }
 
 /** operator== for Colours.
@@ -279,3 +301,164 @@ dcp::string_to_direction (string s)
 
 	boost::throw_exception (DCPReadError ("unknown subtitle direction type"));
 }
+
+/** Convert a content kind to a string which can be used in a
+ *  &lt;ContentKind&gt; node.
+ *  @param kind ContentKind.
+ *  @return string.
+ */
+string
+dcp::content_kind_to_string (ContentKind kind)
+{
+	switch (kind) {
+	case FEATURE:
+		return "feature";
+	case SHORT:
+		return "short";
+	case TRAILER:
+		return "trailer";
+	case TEST:
+		return "test";
+	case TRANSITIONAL:
+		return "transitional";
+	case RATING:
+		return "rating";
+	case TEASER:
+		return "teaser";
+	case POLICY:
+		return "policy";
+	case PUBLIC_SERVICE_ANNOUNCEMENT:
+		return "psa";
+	case ADVERTISEMENT:
+		return "advertisement";
+	case EPISODE:
+		return "episode";
+	case PROMO:
+		return "promo";
+	}
+
+	DCP_ASSERT (false);
+}
+
+/** Convert a string from a &lt;ContentKind&gt; node to a libdcp ContentKind.
+ *  Reasonably tolerant about varying case.
+ *  @param kind Content kind string.
+ *  @return libdcp ContentKind.
+ */
+dcp::ContentKind
+dcp::content_kind_from_string (string kind)
+{
+	transform (kind.begin(), kind.end(), kind.begin(), ::tolower);
+
+	if (kind == "feature") {
+		return FEATURE;
+	} else if (kind == "short") {
+		return SHORT;
+	} else if (kind == "trailer") {
+		return TRAILER;
+	} else if (kind == "test") {
+		return TEST;
+	} else if (kind == "transitional") {
+		return TRANSITIONAL;
+	} else if (kind == "rating") {
+		return RATING;
+	} else if (kind == "teaser") {
+		return TEASER;
+	} else if (kind == "policy") {
+		return POLICY;
+	} else if (kind == "psa") {
+		return PUBLIC_SERVICE_ANNOUNCEMENT;
+	} else if (kind == "advertisement") {
+		return ADVERTISEMENT;
+	} else if (kind == "episode") {
+		return EPISODE;
+	} else if (kind == "promo") {
+		return PROMO;
+	}
+
+	throw BadContentKindError (kind);
+}
+
+string
+dcp::marker_to_string (dcp::Marker m)
+{
+	switch (m) {
+	case FFOC:
+		return "FFOC";
+	case LFOC:
+		return "LFOC";
+	case FFTC:
+		return "FFTC";
+	case LFTC:
+		return "LFTC";
+	case FFOI:
+		return "FFOI";
+	case LFOI:
+		return "LFOI";
+	case FFEC:
+		return "FFEC";
+	case LFEC:
+		return "LFEC";
+	case FFMC:
+		return "FFMC";
+	case LFMC:
+		return "LFMC";
+	}
+
+	DCP_ASSERT (false);
+}
+
+dcp::Marker
+dcp::marker_from_string (string s)
+{
+	if (s == "FFOC") {
+		return FFOC;
+	} else if (s == "LFOC") {
+		return LFOC;
+	} else if (s == "FFTC") {
+		return FFTC;
+	} else if (s == "LFTC") {
+		return LFTC;
+	} else if (s == "FFOI") {
+		return FFOI;
+	} else if (s == "LFOI") {
+		return LFOI;
+	} else if (s == "FFEC") {
+		return FFEC;
+	} else if (s == "LFEC") {
+		return LFEC;
+	} else if (s == "FFMC") {
+		return FFMC;
+	} else if (s == "LFMC") {
+		return LFMC;
+	}
+
+	DCP_ASSERT (false);
+}
+
+Rating::Rating (cxml::ConstNodePtr node)
+{
+	agency = node->string_child("Agency");
+	label = node->string_child("Label");
+	node->done ();
+}
+
+void
+Rating::as_xml (xmlpp::Element* parent) const
+{
+	parent->add_child("Agency")->add_child_text(agency);
+	parent->add_child("Label")->add_child_text(label);
+}
+
+bool
+dcp::operator== (Rating const & a, Rating const & b)
+{
+	return a.agency == b.agency && a.label == b.label;
+}
+
+ostream &
+dcp::operator<< (ostream& s, Rating const & r)
+{
+	s << r.agency << " " << r.label;
+	return s;
+}