Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index 85d951ce169dadb48f602f93d9c9d5990d1e145c..580374623cf9d29f5b2fb4a3c6f10178f3f4270d 100644 (file)
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -20,49 +20,59 @@
 #ifndef DCPOMATIC_COLOUR_CONVERSION_H
 #define DCPOMATIC_COLOUR_CONVERSION_H
 
-#include <boost/utility.hpp>
-#include <boost/optional.hpp>
-#include <boost/numeric/ublas/matrix.hpp>
+/* Hack for OS X compile failure; see https://bugs.launchpad.net/hugin/+bug/910160 */
+#ifdef check
+#undef check
+#endif
 
-namespace cxml {
-       class Node;
-}
+#include <dcp/colour_conversion.h>
+#include <libcxml/cxml.h>
 
 namespace xmlpp {
        class Node;
 }
 
-class ColourConversion
+class ColourConversion : public dcp::ColourConversion
 {
 public:
        ColourConversion ();
-       ColourConversion (double, bool, double const matrix[3][3], double);
-       ColourConversion (boost::shared_ptr<cxml::Node>);
+       ColourConversion (dcp::ColourConversion);
+       ColourConversion (cxml::NodePtr, int version);
 
        virtual void as_xml (xmlpp::Node *) const;
+       std::string identifier () const;
 
        boost::optional<size_t> preset () const;
 
-       double input_gamma;
-       bool input_gamma_linearised;
-       boost::numeric::ublas::matrix<double> matrix;
-       double output_gamma;
+       static boost::optional<ColourConversion> from_xml (cxml::NodePtr, int version);
 };
 
 class PresetColourConversion
 {
 public:
        PresetColourConversion ();
-       PresetColourConversion (std::string, double, bool, double const matrix[3][3], double);
-       PresetColourConversion (boost::shared_ptr<cxml::Node>);
+       PresetColourConversion (std::string n, std::string i, dcp::ColourConversion);
+       PresetColourConversion (cxml::NodePtr node, int version);
 
-       void as_xml (xmlpp::Node *) const;
-
-       std::string name;
        ColourConversion conversion;
+       std::string name;
+       /** an internal short (non-internationalised) name for this preset */
+       std::string id;
+
+       static std::vector<PresetColourConversion> all () {
+               return _presets;
+       }
+
+       static PresetColourConversion from_id (std::string id);
+
+       static void setup_colour_conversion_presets ();
+
+private:
+       static std::vector<PresetColourConversion> _presets;
 };
 
 bool operator== (ColourConversion const &, ColourConversion const &);
 bool operator!= (ColourConversion const &, ColourConversion const &);
+bool operator== (PresetColourConversion const &, PresetColourConversion const &);
 
 #endif