11b5bf6229b8713dffde89a777cd5181335136f6 from master; default colour conversions depending on type and resolution

1 files changed, 6 insertions, 2 deletions

diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index 1b42dffb7..06a9cf6c3 100644
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -52,16 +52,20 @@ class PresetColourConversion
 {
 public:
 	PresetColourConversion ();
-	PresetColourConversion (std::string, dcp::ColourConversion);
+	PresetColourConversion (std::string n, std::string i, dcp::ColourConversion);
 	PresetColourConversion (cxml::NodePtr node, int version);
 
 	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: