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 bf883a07c32413f3bd28071ee287882ea6cc0a08..580374623cf9d29f5b2fb4a3c6f10178f3f4270d 100644 (file)
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -27,7 +27,6 @@
 
 #include <dcp/colour_conversion.h>
 #include <libcxml/cxml.h>
-#include <boost/utility.hpp>
 
 namespace xmlpp {
        class Node;
@@ -38,30 +37,42 @@ class ColourConversion : public dcp::ColourConversion
 public:
        ColourConversion ();
        ColourConversion (dcp::ColourConversion);
-       ColourConversion (cxml::NodePtr);
+       ColourConversion (cxml::NodePtr, int version);
 
        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);
+       static boost::optional<ColourConversion> from_xml (cxml::NodePtr, int version);
 };
 
 class PresetColourConversion
 {
 public:
        PresetColourConversion ();
-       PresetColourConversion (std::string, dcp::ColourConversion);
-       PresetColourConversion (cxml::NodePtr);
+       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