Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 3c076b030ed19ee7d483f130287b8e73c3303270..6603e21e68b2e13ef0c35c073c925feda928eec6 100644 (file)
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -28,6 +28,8 @@
 #include <dcp/modified_gamma_transfer_function.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -39,16 +41,18 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 
+vector<PresetColourConversion> PresetColourConversion::_presets;
+
 ColourConversion::ColourConversion ()
        : dcp::ColourConversion (dcp::ColourConversion::srgb_to_xyz ())
 {
-       
+
 }
 
 ColourConversion::ColourConversion (dcp::ColourConversion conversion_)
        : dcp::ColourConversion (conversion_)
 {
-       
+
 }
 
 ColourConversion::ColourConversion (cxml::NodePtr node, int version)
@@ -75,7 +79,7 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
        } else {
 
                /* Version 1.x */
-               
+
                if (node->bool_child ("InputGammaLinearised")) {
                        _in.reset (new dcp::ModifiedGammaTransferFunction (node->number_child<float> ("InputGamma"), 0.04045, 0.055, 12.92));
                } else {
@@ -84,7 +88,7 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
        }
 
        _yuv_to_rgb = static_cast<dcp::YUVToRGB> (node->optional_number_child<int>("YUVToRGB").get_value_or (dcp::YUV_TO_RGB_REC601));
-       
+
        list<cxml::NodePtr> m = node->node_children ("Matrix");
        if (!m.empty ()) {
                /* Read in old <Matrix> nodes and convert them to chromaticities */
@@ -114,8 +118,8 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
                                node->number_child<double> ("AdjustedWhiteX"), node->number_child<double> ("AdjustedWhiteY")
                                );
                }
-       }       
-       
+       }
+
        _out.reset (new dcp::GammaTransferFunction (node->number_child<double> ("OutputGamma")));
 }
 
@@ -146,6 +150,7 @@ ColourConversion::as_xml (xmlpp::Node* node) const
                in_node->add_child("B")->add_child_text (raw_convert<string> (tf->B ()));
        }
 
+       node->add_child("YUVToRGB")->add_child_text (raw_convert<string> (_yuv_to_rgb));
        node->add_child("RedX")->add_child_text (raw_convert<string> (_red.x));
        node->add_child("RedY")->add_child_text (raw_convert<string> (_red.y));
        node->add_child("GreenX")->add_child_text (raw_convert<string> (_green.x));
@@ -165,9 +170,9 @@ ColourConversion::as_xml (xmlpp::Node* node) const
 optional<size_t>
 ColourConversion::preset () const
 {
-       vector<PresetColourConversion> presets = Config::instance()->colour_conversions ();
+       vector<PresetColourConversion> presets = PresetColourConversion::all ();
        size_t i = 0;
-       while (i < presets.size() && (presets[i].conversion != *this)) {
+       while (i < presets.size() && presets[i].conversion != *this) {
                ++i;
        }
 
@@ -209,7 +214,7 @@ ColourConversion::identifier () const
        }
 
        digester.add (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)->gamma ());
-       
+
        return digester.get ();
 }
 
@@ -219,9 +224,10 @@ PresetColourConversion::PresetColourConversion ()
 
 }
 
-PresetColourConversion::PresetColourConversion (string n, dcp::ColourConversion conversion_)
+PresetColourConversion::PresetColourConversion (string n, string i, dcp::ColourConversion conversion_)
        : conversion (conversion_)
        , name (n)
+       , id (i)
 {
 
 }
@@ -233,13 +239,6 @@ PresetColourConversion::PresetColourConversion (cxml::NodePtr node, int version)
 
 }
 
-void
-PresetColourConversion::as_xml (xmlpp::Node* node) const
-{
-       conversion.as_xml (node);
-       node->add_child("Name")->add_child_text (name);
-}
-
 bool
 operator== (ColourConversion const & a, ColourConversion const & b)
 {
@@ -257,3 +256,24 @@ operator== (PresetColourConversion const & a, PresetColourConversion const & b)
 {
        return a.name == b.name && a.conversion == b.conversion;
 }
+
+void
+PresetColourConversion::setup_colour_conversion_presets ()
+{
+       _presets.push_back (PresetColourConversion (_("sRGB"), "srgb", dcp::ColourConversion::srgb_to_xyz ()));
+       _presets.push_back (PresetColourConversion (_("Rec. 601"), "rec601", dcp::ColourConversion::rec601_to_xyz ()));
+       _presets.push_back (PresetColourConversion (_("Rec. 709"), "rec709", dcp::ColourConversion::rec709_to_xyz ()));
+       _presets.push_back (PresetColourConversion (_("P3"), "p3", dcp::ColourConversion::p3_to_xyz ()));
+}
+
+PresetColourConversion
+PresetColourConversion::from_id (string s)
+{
+       BOOST_FOREACH (PresetColourConversion const& i, _presets) {
+               if (i.id == s) {
+                       return i;
+               }
+       }
+
+       DCPOMATIC_ASSERT (false);
+}