wip: got stuck... because PlayerVideo is related to the render size

[dcpomatic.git] / src / lib / pixel_quanta.h

diff --git a/src/lib/pixel_quanta.h b/src/lib/pixel_quanta.h
index e4a03c9d2a126839294a8916d86261c5d4d52a50..46bfdffd0b7cd03c57fcf69f7544c525297e600e 100644 (file)
--- a/src/lib/pixel_quanta.h
+++ b/src/lib/pixel_quanta.h
@@ -23,12 +23,12 @@
 #define DCPOMATIC_PIXEL_QUANTA_H
 
 
-#include "warnings.h"
-
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/types.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 class PixelQuanta
@@ -52,12 +52,18 @@ public:
 
        void as_xml (xmlpp::Element* node) const;
 
+       int round_x (int x_) const;
+       int round_y (int y_) const;
+       dcp::Size round (dcp::Size size) const;
+
        int x;
        int y;
 };
 
 
 PixelQuanta max (PixelQuanta const& a, PixelQuanta const& b);
+bool operator==(PixelQuanta const& a, PixelQuanta const& b);
+bool operator!=(PixelQuanta const& a, PixelQuanta const& b);
 
 #endif