Merge remote-tracking branch 'origin/master' into 2.0

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 24f9242ec259afdfb93ff3c04eef98b0b9738ca9..71431ec0db63e18b172b7693bfc95398f128091d 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -23,8 +23,8 @@
 #include <glib.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <libdcp/colour_matrix.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include "config.h"
 #include "server.h"
@@ -32,7 +32,7 @@
 #include "filter.h"
 #include "ratio.h"
 #include "dcp_content_type.h"
-#include "sound_processor.h"
+#include "cinema_sound_processor.h"
 #include "colour_conversion.h"
 #include "cinema.h"
 #include "util.h"
@@ -50,7 +50,7 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::algorithm::is_any_of;
 using boost::algorithm::split;
-using libdcp::raw_convert;
+using dcp::raw_convert;
 
 Config* Config::_instance = 0;
 
@@ -60,7 +60,7 @@ Config::Config ()
        , _server_port_base (6192)
        , _use_any_servers (true)
        , _tms_path (".")
-       , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
+       , _cinema_sound_processor (CinemaSoundProcessor::from_id (N_("dolby_cp750")))
        , _allow_any_dcp_frame_rate (false)
        , _default_still_length (10)
        , _default_container (Ratio::from_id ("185"))
@@ -79,9 +79,9 @@ Config::Config ()
        _allowed_dcp_frame_rates.push_back (50);
        _allowed_dcp_frame_rates.push_back (60);
 
-       _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6));
-       _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::srgb_to_xyz, 2.6));
-       _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, libdcp::colour_matrix::rec709_to_xyz, 2.6));
+       _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6));
+       _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, dcp::colour_matrix::srgb_to_xyz, 2.6));
+       _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6));
 
        reset_kdm_email ();
 }
@@ -90,7 +90,6 @@ void
 Config::read ()
 {
        if (!boost::filesystem::exists (file (false))) {
-               read_old_metadata ();
                return;
        }
 
@@ -128,7 +127,11 @@ Config::read ()
 
        c = f.optional_string_child ("SoundProcessor");
        if (c) {
-               _sound_processor = SoundProcessor::from_id (c.get ());
+               _cinema_sound_processor = CinemaSoundProcessor::from_id (c.get ());
+       }
+       c = f.optional_string_child ("CinemaSoundProcessor");
+       if (c) {
+               _cinema_sound_processor = CinemaSoundProcessor::from_id (c.get ());
        }
 
        _language = f.optional_string_child ("Language");
@@ -170,7 +173,7 @@ Config::read ()
                /* Loading version 0 (before Rec. 709 was added as a preset).
                   Add it in.
                */
-               _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, libdcp::colour_matrix::rec709_to_xyz, 2.6));
+               _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6));
        }
 
        list<cxml::NodePtr> cin = f.node_children ("Cinema");
@@ -200,70 +203,6 @@ Config::read ()
        _log_types = f.optional_number_child<int> ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR);
 }
 
-void
-Config::read_old_metadata ()
-{
-       /* XXX: this won't work with non-Latin filenames */
-       ifstream f (file(true).string().c_str ());
-       string line;
-
-       while (getline (f, line)) {
-               if (line.empty ()) {
-                       continue;
-               }
-
-               if (line[0] == '#') {
-                       continue;
-               }
-
-               size_t const s = line.find (' ');
-               if (s == string::npos) {
-                       continue;
-               }
-               
-               string const k = line.substr (0, s);
-               string const v = line.substr (s + 1);
-
-               if (k == N_("num_local_encoding_threads")) {
-                       _num_local_encoding_threads = atoi (v.c_str ());
-               } else if (k == N_("default_directory")) {
-                       _default_directory = v;
-               } else if (k == N_("server_port")) {
-                       _server_port_base = atoi (v.c_str ());
-               } else if (k == N_("server")) {
-                       vector<string> b;
-                       split (b, v, is_any_of (" "));
-                       if (b.size() == 2) {
-                               _servers.push_back (b[0]);
-                       }
-               } else if (k == N_("tms_ip")) {
-                       _tms_ip = v;
-               } else if (k == N_("tms_path")) {
-                       _tms_path = v;
-               } else if (k == N_("tms_user")) {
-                       _tms_user = v;
-               } else if (k == N_("tms_password")) {
-                       _tms_password = v;
-               } else if (k == N_("sound_processor")) {
-                       _sound_processor = SoundProcessor::from_id (v);
-               } else if (k == "language") {
-                       _language = v;
-               } else if (k == "default_container") {
-                       _default_container = Ratio::from_id (v);
-               } else if (k == "default_dcp_content_type") {
-                       _default_dcp_content_type = DCPContentType::from_isdcf_name (v);
-               } else if (k == "dcp_metadata_issuer") {
-                       _dcp_metadata.issuer = v;
-               } else if (k == "dcp_metadata_creator") {
-                       _dcp_metadata.creator = v;
-               } else if (k == "dcp_metadata_issue_date") {
-                       _dcp_metadata.issue_date = v;
-               }
-
-               _default_isdcf_metadata.read_old_metadata (k, v);
-       }
-}
-
 /** @return Filename to write configuration to */
 boost::filesystem::path
 Config::file (bool old) const
@@ -335,8 +274,8 @@ Config::write () const
        root->add_child("TMSPath")->add_child_text (_tms_path);
        root->add_child("TMSUser")->add_child_text (_tms_user);
        root->add_child("TMSPassword")->add_child_text (_tms_password);
-       if (_sound_processor) {
-               root->add_child("SoundProcessor")->add_child_text (_sound_processor->id ());
+       if (_cinema_sound_processor) {
+               root->add_child("CinemaSoundProcessor")->add_child_text (_cinema_sound_processor->id ());
        }
        if (_language) {
                root->add_child("Language")->add_child_text (_language.get());