Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/types.cc b/src/lib/types.cc
index 78cb4cd6490990bee12d75526c4a6178530152ff..694c34cc0f2aeb04d0015389d8e78b9862827ba2 100644 (file)
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -18,9 +18,15 @@
 */
 
 #include "types.h"
+#include "dcpomatic_assert.h"
+#include "raw_convert.h"
+#include <libxml++/libxml++.h>
+#include <libcxml/cxml.h>
 
 using std::max;
 using std::min;
+using std::string;
+using boost::shared_ptr;
 
 bool operator== (Crop const & a, Crop const & b)
 {
@@ -32,25 +38,52 @@ bool operator!= (Crop const & a, Crop const & b)
        return !(a == b);
 }
 
-
-/** @param other A Rect.
- *  @return The intersection of this with `other'.
+/** @param r Resolution.
+ *  @return Untranslated string representation.
  */
-dcpomatic::Rect
-dcpomatic::Rect::intersection (Rect const & other) const
+string
+resolution_to_string (Resolution r)
+{
+       switch (r) {
+       case RESOLUTION_2K:
+               return "2K";
+       case RESOLUTION_4K:
+               return "4K";
+       }
+
+       DCPOMATIC_ASSERT (false);
+       return "";
+}
+
+
+Resolution
+string_to_resolution (string s)
+{
+       if (s == "2K") {
+               return RESOLUTION_2K;
+       }
+
+       if (s == "4K") {
+               return RESOLUTION_4K;
+       }
+
+       DCPOMATIC_ASSERT (false);
+       return RESOLUTION_2K;
+}
+
+Crop::Crop (shared_ptr<cxml::Node> node)
 {
-       int const tx = max (x, other.x);
-       int const ty = max (y, other.y);
-       
-       return Rect (
-               tx, ty,
-               min (x + width, other.x + other.width) - tx,
-               min (y + height, other.y + other.height) - ty
-               );
+       left = node->number_child<int> ("LeftCrop");
+       right = node->number_child<int> ("RightCrop");
+       top = node->number_child<int> ("TopCrop");
+       bottom = node->number_child<int> ("BottomCrop");
 }
 
-bool
-dcpomatic::Rect::contains (Position p) const
+void
+Crop::as_xml (xmlpp::Node* node) const
 {
-       return (p.x >= x && p.x <= (x + width) && p.y >= y && p.y <= (y + height));
+       node->add_child("LeftCrop")->add_child_text (raw_convert<string> (left));
+       node->add_child("RightCrop")->add_child_text (raw_convert<string> (right));
+       node->add_child("TopCrop")->add_child_text (raw_convert<string> (top));
+       node->add_child("BottomCrop")->add_child_text (raw_convert<string> (bottom));
 }