projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use get_pixel_size rather than get_size which is slightly nicer as we then don't...
[dcpomatic.git]
/
src
/
lib
/
colour_conversion.h
diff --git
a/src/lib/colour_conversion.h
b/src/lib/colour_conversion.h
index 1b42dffb7829c43f98baab2ae8fb54baca17f7f2..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 <dcp/colour_conversion.h>
#include <libcxml/cxml.h>
-#include <boost/utility.hpp>
namespace xmlpp {
class Node;
namespace xmlpp {
class Node;
@@
-52,18
+51,22
@@
class PresetColourConversion
{
public:
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;
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 std::vector<PresetColourConversion> all () {
return _presets;
}
+ static PresetColourConversion from_id (std::string id);
+
static void setup_colour_conversion_presets ();
static void setup_colour_conversion_presets ();
-
+
private:
static std::vector<PresetColourConversion> _presets;
};
private:
static std::vector<PresetColourConversion> _presets;
};