Try to fix seeking with FFmpeg.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index b6f464717b48c7f6ca3f5a590c58ca5480d01e22..c9ec730f20aa94c03357b56cbd9398e21698eb46 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -27,7 +27,7 @@
 #include "server.h"
 #include "scaler.h"
 #include "filter.h"
-#include "format.h"
+#include "ratio.h"
 #include "dcp_content_type.h"
 #include "sound_processor.h"
 
@@ -48,11 +48,10 @@ Config* Config::_instance = 0;
 Config::Config ()
        : _num_local_encoding_threads (2)
        , _server_port (6192)
-       , _reference_scaler (Scaler::from_id (N_("bicubic")))
        , _tms_path (N_("."))
        , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
        , _default_still_length (10)
-       , _default_format (0)
+       , _default_container (Ratio::from_id ("185"))
        , _default_dcp_content_type (0)
 {
        _allowed_dcp_frame_rates.push_back (24);
@@ -61,7 +60,11 @@ Config::Config ()
        _allowed_dcp_frame_rates.push_back (48);
        _allowed_dcp_frame_rates.push_back (50);
        _allowed_dcp_frame_rates.push_back (60);
+}
 
+void
+Config::read ()
+{
        if (!boost::filesystem::exists (file (false))) {
                read_old_metadata ();
                return;
@@ -73,15 +76,6 @@ Config::Config ()
        _num_local_encoding_threads = f.number_child<int> ("NumLocalEncodingThreads");
        _default_directory = f.string_child ("DefaultDirectory");
        _server_port = f.number_child<int> ("ServerPort");
-       c = f.optional_string_child ("ReferenceScaler");
-       if (c) {
-               _reference_scaler = Scaler::from_id (c.get ());
-       }
-
-       list<shared_ptr<cxml::Node> > filters = f.node_children ("ReferenceFilter");
-       for (list<shared_ptr<cxml::Node> >::iterator i = filters.begin(); i != filters.end(); ++i) {
-               _reference_filters.push_back (Filter::from_id ((*i)->content ()));
-       }
        
        list<shared_ptr<cxml::Node> > servers = f.node_children ("Server");
        for (list<shared_ptr<cxml::Node> >::iterator i = servers.begin(); i != servers.end(); ++i) {
@@ -100,9 +94,9 @@ Config::Config ()
 
        _language = f.optional_string_child ("Language");
 
-       c = f.optional_string_child ("DefaultFormat");
+       c = f.optional_string_child ("DefaultContainer");
        if (c) {
-               _default_format = Format::from_id (c.get ());
+               _default_container = Ratio::from_id (c.get ());
        }
 
        c = f.optional_string_child ("DefaultDCPContentType");
@@ -145,10 +139,6 @@ Config::read_old_metadata ()
                        _default_directory = v;
                } else if (k == N_("server_port")) {
                        _server_port = atoi (v.c_str ());
-               } else if (k == N_("reference_scaler")) {
-                       _reference_scaler = Scaler::from_id (v);
-               } else if (k == N_("reference_filter")) {
-                       _reference_filters.push_back (Filter::from_id (v));
                } else if (k == N_("server")) {
                        _servers.push_back (ServerDescription::create_from_metadata (v));
                } else if (k == N_("tms_ip")) {
@@ -163,8 +153,8 @@ Config::read_old_metadata ()
                        _sound_processor = SoundProcessor::from_id (v);
                } else if (k == "language") {
                        _language = v;
-               } else if (k == "default_format") {
-                       _default_format = Format::from_id (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_dci_name (v);
                } else if (k == "dcp_metadata_issuer") {
@@ -185,6 +175,8 @@ Config::file (bool old) const
 {
        boost::filesystem::path p;
        p /= g_get_user_config_dir ();
+       boost::system::error_code ec;
+       boost::filesystem::create_directory (p, ec);
        if (old) {
                p /= ".dvdomatic";
        } else {
@@ -199,6 +191,13 @@ Config::instance ()
 {
        if (_instance == 0) {
                _instance = new Config;
+               try {
+                       _instance->read ();
+               } catch (...) {
+                       /* configuration load failed; never mind, just
+                          stick with the default.
+                       */
+               }
        }
 
        return _instance;
@@ -214,13 +213,6 @@ Config::write () const
        root->add_child("NumLocalEncodingThreads")->add_child_text (lexical_cast<string> (_num_local_encoding_threads));
        root->add_child("DefaultDirectory")->add_child_text (_default_directory);
        root->add_child("ServerPort")->add_child_text (lexical_cast<string> (_server_port));
-       if (_reference_scaler) {
-               root->add_child("ReferenceScaler")->add_child_text (_reference_scaler->id ());
-       }
-
-       for (vector<Filter const *>::const_iterator i = _reference_filters.begin(); i != _reference_filters.end(); ++i) {
-               root->add_child("ReferenceFilter")->add_child_text ((*i)->id ());
-       }
        
        for (vector<ServerDescription*>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
                (*i)->as_xml (root->add_child ("Server"));
@@ -236,8 +228,8 @@ Config::write () const
        if (_language) {
                root->add_child("Language")->add_child_text (_language.get());
        }
-       if (_default_format) {
-               root->add_child("DefaultFormat")->add_child_text (_default_format->id ());
+       if (_default_container) {
+               root->add_child("DefaultContainer")->add_child_text (_default_container->id ());
        }
        if (_default_dcp_content_type) {
                root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->dci_name ());