summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-08-03 00:00:39 +0100
committerCarl Hetherington <cth@carlh.net>2012-08-03 00:00:39 +0100
commit894f567beaabb43cf96651e61c29d04f3e02ae50 (patch)
treedb7fa032270d88fabfe0e4819e48ab2e68a93150 /src/lib
parentbd540e569b65e4949aac80b988bfa421a0be90e6 (diff)
A bit of tidying up; don't build player ever for now; add -c option to makedcp to output configuration information.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/config.h3
-rw-r--r--src/lib/util.cc17
-rw-r--r--src/lib/util.h2
3 files changed, 19 insertions, 3 deletions
diff --git a/src/lib/config.h b/src/lib/config.h
index 64bcf4d86..14b541ee6 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -54,7 +54,6 @@ public:
/** @return index of colour LUT to use when converting RGB to XYZ.
* 0: sRGB
* 1: Rec 709
- * 2: DC28
*/
int colour_lut_index () const {
return _colour_lut_index;
@@ -185,7 +184,7 @@ private:
* (see colour_lut_index ())
*/
int _colour_lut_index;
- /** bandwidth for J2K files in Mb/s */
+ /** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
/** J2K encoding servers to use */
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 1ab8c1e65..1478bab2e 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -503,3 +503,20 @@ bool operator!= (Crop const & a, Crop const & b)
{
return !(a == b);
}
+
+string
+colour_lut_index_to_name (int index)
+{
+ switch (index) {
+ case 0:
+ return "sRGB";
+ case 1:
+ return "Rec 709";
+ }
+
+ assert (false);
+ return "";
+}
+
+
+
diff --git a/src/lib/util.h b/src/lib/util.h
index 16afb7bb6..568fe05d0 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -133,7 +133,7 @@ struct Position
};
extern std::string crop_string (Position, Size);
-
extern int dcp_audio_sample_rate (int);
+extern std::string colour_lut_index_to_name (int index);
#endif