Basic adaptations for changes to libdcp1 colour conversion handling.

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

diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index ed89f8c635a9932d60fe78b14211320d58385801..bf883a07c32413f3bd28071ee287882ea6cc0a08 100644 (file)
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -17,29 +17,51 @@
 
 */
 
-#include <boost/utility.hpp>
-#include <boost/numeric/ublas/matrix.hpp>
+#ifndef DCPOMATIC_COLOUR_CONVERSION_H
+#define DCPOMATIC_COLOUR_CONVERSION_H
 
-namespace cxml {
-       class Node;
-}
+/* Hack for OS X compile failure; see https://bugs.launchpad.net/hugin/+bug/910160 */
+#ifdef check
+#undef check
+#endif
+
+#include <dcp/colour_conversion.h>
+#include <libcxml/cxml.h>
+#include <boost/utility.hpp>
 
 namespace xmlpp {
        class Node;
 }
 
-class ColourConversion : public boost::noncopyable
+class ColourConversion : public dcp::ColourConversion
 {
 public:
        ColourConversion ();
-       ColourConversion (std::string, float, bool, float const matrix[3][3], float);
-       ColourConversion (boost::shared_ptr<cxml::Node>);
+       ColourConversion (dcp::ColourConversion);
+       ColourConversion (cxml::NodePtr);
+
+       virtual void as_xml (xmlpp::Node *) const;
+       std::string identifier () const;
+
+       boost::optional<size_t> preset () const;
+
+       static boost::optional<ColourConversion> from_xml (cxml::NodePtr);
+};
+
+class PresetColourConversion
+{
+public:
+       PresetColourConversion ();
+       PresetColourConversion (std::string, dcp::ColourConversion);
+       PresetColourConversion (cxml::NodePtr);
 
        void as_xml (xmlpp::Node *) const;
 
        std::string name;
-       float input_gamma;
-       bool input_gamma_linearised;
-       boost::numeric::ublas::matrix<float> matrix;
-       float output_gamma;
+       ColourConversion conversion;
 };
+
+bool operator== (ColourConversion const &, ColourConversion const &);
+bool operator!= (ColourConversion const &, ColourConversion const &);
+
+#endif