Make batch converter basically work.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 307b9684414359ffb823a937f3febc515711db84..8c65e371a229aef9ff090f50f7e9deb57170d6c6 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -26,8 +26,12 @@
 #include "server.h"
 #include "scaler.h"
 #include "filter.h"
+#include "format.h"
+#include "dcp_content_type.h"
 #include "sound_processor.h"
 
+#include "i18n.h"
+
 using std::vector;
 using std::ifstream;
 using std::string;
@@ -40,13 +44,18 @@ Config* Config::_instance = 0;
 Config::Config ()
        : _num_local_encoding_threads (2)
        , _server_port (6192)
-       , _reference_scaler (Scaler::from_id ("bicubic"))
-       , _tms_path (".")
-       , _sound_processor (SoundProcessor::from_id ("dolby_cp750"))
+       , _reference_scaler (Scaler::from_id (N_("bicubic")))
+       , _tms_path (N_("."))
+       , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
+       , _default_format (0)
+       , _default_dcp_content_type (0)
 {
        _allowed_dcp_frame_rates.push_back (24);
        _allowed_dcp_frame_rates.push_back (25);
        _allowed_dcp_frame_rates.push_back (30);
+       _allowed_dcp_frame_rates.push_back (48);
+       _allowed_dcp_frame_rates.push_back (50);
+       _allowed_dcp_frame_rates.push_back (60);
        
        ifstream f (file().c_str ());
        string line;
@@ -67,29 +76,43 @@ Config::Config ()
                string const k = line.substr (0, s);
                string const v = line.substr (s + 1);
 
-               if (k == "num_local_encoding_threads") {
+               if (k == N_("num_local_encoding_threads")) {
                        _num_local_encoding_threads = atoi (v.c_str ());
-               } else if (k == "default_directory") {
+               } else if (k == N_("default_directory")) {
                        _default_directory = v;
-               } else if (k == "server_port") {
+               } else if (k == N_("server_port")) {
                        _server_port = atoi (v.c_str ());
-               } else if (k == "reference_scaler") {
+               } else if (k == N_("reference_scaler")) {
                        _reference_scaler = Scaler::from_id (v);
-               } else if (k == "reference_filter") {
+               } else if (k == N_("reference_filter")) {
                        _reference_filters.push_back (Filter::from_id (v));
-               } else if (k == "server") {
+               } else if (k == N_("server")) {
                        _servers.push_back (ServerDescription::create_from_metadata (v));
-               } else if (k == "tms_ip") {
+               } else if (k == N_("tms_ip")) {
                        _tms_ip = v;
-               } else if (k == "tms_path") {
+               } else if (k == N_("tms_path")) {
                        _tms_path = v;
-               } else if (k == "tms_user") {
+               } else if (k == N_("tms_user")) {
                        _tms_user = v;
-               } else if (k == "tms_password") {
+               } else if (k == N_("tms_password")) {
                        _tms_password = v;
-               } else if (k == "sound_processor") {
+               } else if (k == N_("sound_processor")) {
                        _sound_processor = SoundProcessor::from_id (v);
+               } else if (k == "language") {
+                       _language = v;
+               } else if (k == "default_format") {
+                       _default_format = Format::from_metadata (v);
+               } else if (k == "default_dcp_content_type") {
+                       _default_dcp_content_type = DCPContentType::from_dci_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_dci_metadata.read (k, v);
        }
 }
 
@@ -99,7 +122,7 @@ Config::file () const
 {
        boost::filesystem::path p;
        p /= g_get_user_config_dir ();
-       p /= ".dvdomatic";
+       p /= N_(".dvdomatic");
        return p.string ();
 }
 
@@ -121,8 +144,11 @@ Config::write () const
        ofstream f (file().c_str ());
        f << "num_local_encoding_threads " << _num_local_encoding_threads << "\n"
          << "default_directory " << _default_directory << "\n"
-         << "server_port " << _server_port << "\n"
-         << "reference_scaler " << _reference_scaler->id () << "\n";
+         << "server_port " << _server_port << "\n";
+
+       if (_reference_scaler) {
+               f << "reference_scaler " << _reference_scaler->id () << "\n";
+       }
 
        for (vector<Filter const *>::const_iterator i = _reference_filters.begin(); i != _reference_filters.end(); ++i) {
                f << "reference_filter " << (*i)->id () << "\n";
@@ -136,7 +162,23 @@ Config::write () const
        f << "tms_path " << _tms_path << "\n";
        f << "tms_user " << _tms_user << "\n";
        f << "tms_password " << _tms_password << "\n";
-       f << "sound_processor " << _sound_processor->id ();
+       if (_sound_processor) {
+               f << "sound_processor " << _sound_processor->id () << "\n";
+       }
+       if (_language) {
+               f << "language " << _language.get() << "\n";
+       }
+       if (_default_format) {
+               f << "default_format " << _default_format->as_metadata() << "\n";
+       }
+       if (_default_dcp_content_type) {
+               f << "default_dcp_content_type " << _default_dcp_content_type->dci_name() << "\n";
+       }
+       f << "dcp_metadata_issuer " << _dcp_metadata.issuer << "\n";
+       f << "dcp_metadata_creator " << _dcp_metadata.creator << "\n";
+       f << "dcp_metadata_issue_date " << _dcp_metadata.issue_date << "\n";
+
+       _default_dci_metadata.write (f);
 }
 
 string
@@ -148,3 +190,10 @@ Config::default_directory_or (string a) const
 
        return _default_directory;
 }
+
+void
+Config::drop ()
+{
+       delete _instance;
+       _instance = 0;
+}