summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/colour_conversion.cc23
-rw-r--r--src/lib/colour_conversion.h11
-rw-r--r--src/lib/config.cc29
-rw-r--r--src/lib/config.h10
-rw-r--r--src/lib/player.cc2
-rw-r--r--src/lib/util.cc1
6 files changed, 25 insertions, 51 deletions
diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 3c076b030..cb3a92c1a 100644
--- 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,7 @@
#include <dcp/modified_gamma_transfer_function.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
#include "i18n.h"
@@ -39,6 +40,8 @@ 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 ())
{
@@ -165,7 +168,7 @@ 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)) {
++i;
@@ -233,13 +236,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 +253,12 @@ 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"), dcp::ColourConversion::srgb_to_xyz ()));
+ _presets.push_back (PresetColourConversion (_("Rec. 601"), dcp::ColourConversion::rec601_to_xyz ()));
+ _presets.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
+ _presets.push_back (PresetColourConversion (_("P3"), dcp::ColourConversion::p3_to_xyz ()));
+}
diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index 9f07e0956..1b42dffb7 100644
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -55,10 +55,17 @@ public:
PresetColourConversion (std::string, dcp::ColourConversion);
PresetColourConversion (cxml::NodePtr node, int version);
- void as_xml (xmlpp::Node *) const;
-
ColourConversion conversion;
std::string name;
+
+ static std::vector<PresetColourConversion> all () {
+ return _presets;
+ }
+
+ static void setup_colour_conversion_presets ();
+
+private:
+ static std::vector<PresetColourConversion> _presets;
};
bool operator== (ColourConversion const &, ColourConversion const &);
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 5a0b74854..bbb7e1e0b 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -91,12 +91,6 @@ Config::set_defaults ()
_allowed_dcp_frame_rates.push_back (50);
_allowed_dcp_frame_rates.push_back (60);
- _colour_conversions.clear ();
- _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ()));
- _colour_conversions.push_back (PresetColourConversion (_("Rec. 601"), dcp::ColourConversion::rec601_to_xyz ()));
- _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
- _colour_conversions.push_back (PresetColourConversion (_("P3 (from SMPTE RP 431-2)"), dcp::ColourConversion::p3_to_xyz ()));
-
set_kdm_email_to_default ();
}
@@ -187,25 +181,6 @@ Config::read ()
_default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000);
_default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or (0);
- list<cxml::NodePtr> cc = f.node_children ("ColourConversion");
-
- if (!cc.empty ()) {
- _colour_conversions.clear ();
- }
-
- try {
- for (list<cxml::NodePtr>::iterator i = cc.begin(); i != cc.end(); ++i) {
- /* This is a bit of a hack; use 32 (the first Film state file version for the 2.x branch)
- for version 2 and 10 (the current Film state version for the 1.x branch) for version 1.
- */
- _colour_conversions.push_back (PresetColourConversion (*i, version == 2 ? 32 : 10));
- }
- } catch (cxml::Error) {
- /* Probably failed to load an old-style ColourConversion tag; just give up */
- _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ()));
- _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
- }
-
list<cxml::NodePtr> cin = f.node_children ("Cinema");
for (list<cxml::NodePtr>::iterator i = cin.begin(); i != cin.end(); ++i) {
/* Slightly grotty two-part construction of Cinema here so that we can use
@@ -355,10 +330,6 @@ Config::write () const
root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert<string> (_default_j2k_bandwidth));
root->add_child("DefaultAudioDelay")->add_child_text (raw_convert<string> (_default_audio_delay));
- for (vector<PresetColourConversion>::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) {
- i->as_xml (root->add_child ("ColourConversion"));
- }
-
for (list<shared_ptr<Cinema> >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) {
(*i)->as_xml (root->add_child ("Cinema"));
}
diff --git a/src/lib/config.h b/src/lib/config.h
index f436061e8..b39e7af3a 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -25,7 +25,6 @@
#define DCPOMATIC_CONFIG_H
#include "isdcf_metadata.h"
-#include "colour_conversion.h"
#include "video_content.h"
#include <dcp/metadata.h>
#include <dcp/certificates.h>
@@ -154,10 +153,6 @@ public:
return _default_audio_delay;
}
- std::vector<PresetColourConversion> colour_conversions () const {
- return _colour_conversions;
- }
-
std::string mail_server () const {
return _mail_server;
}
@@ -325,10 +320,6 @@ public:
maybe_set (_default_audio_delay, d);
}
- void set_colour_conversions (std::vector<PresetColourConversion> const & c) {
- maybe_set (_colour_conversions, c);
- }
-
void set_mail_server (std::string s) {
maybe_set (_mail_server, s);
}
@@ -464,7 +455,6 @@ private:
std::string _dcp_issuer;
int _default_j2k_bandwidth;
int _default_audio_delay;
- std::vector<PresetColourConversion> _colour_conversions;
std::list<boost::shared_ptr<Cinema> > _cinemas;
std::string _mail_server;
std::string _mail_user;
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 640253c6d..d5098fed7 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -307,7 +307,7 @@ Player::black_player_video_frame (DCPTime time) const
_video_container_size,
EYES_BOTH,
PART_WHOLE,
- Config::instance()->colour_conversions().front().conversion
+ PresetColourConversion::all().front().conversion
)
);
}
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 0b35ad539..dccf32f4d 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -325,6 +325,7 @@ dcpomatic_setup ()
dcp::init ();
Ratio::setup_ratios ();
+ PresetColourConversion::setup_colour_conversion_presets ();
VideoContentScale::setup_scales ();
DCPContentType::setup_dcp_content_types ();
Filter::setup_filters ();
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-11 13:21:50 +0000