Try removing force of single-threaded decoding again.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 711963a26068c78b9df207a987252932932283d2..d19adc2a41886e4fd7dd7c46eb569b6f4eece5d9 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -25,7 +25,6 @@
 #include "config.h"
 #include "server.h"
 #include "scaler.h"
-#include "screen.h"
 #include "filter.h"
 #include "sound_processor.h"
 
@@ -68,6 +67,8 @@ Config::Config ()
 
                if (k == "num_local_encoding_threads") {
                        _num_local_encoding_threads = atoi (v.c_str ());
+               } else if (k == "default_directory") {
+                       _default_directory = v;
                } else if (k == "server_port") {
                        _server_port = atoi (v.c_str ());
                } else if (k == "colour_lut_index") {
@@ -80,8 +81,6 @@ Config::Config ()
                        _reference_filters.push_back (Filter::from_id (v));
                } else if (k == "server") {
                        _servers.push_back (ServerDescription::create_from_metadata (v));
-               } else if (k == "screen") {
-                       _screens.push_back (Screen::create_from_metadata (v));
                } else if (k == "tms_ip") {
                        _tms_ip = v;
                } else if (k == "tms_path") {
@@ -94,8 +93,6 @@ Config::Config ()
                        _sound_processor = SoundProcessor::from_id (v);
                }
        }
-
-       Changed ();
 }
 
 /** @return Filename to write configuration to */
@@ -125,6 +122,7 @@ 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"
          << "colour_lut_index " << _colour_lut_index << "\n"
          << "j2k_bandwidth " << _j2k_bandwidth << "\n"
@@ -138,13 +136,19 @@ Config::write () const
                f << "server " << (*i)->as_metadata () << "\n";
        }
 
-       for (vector<shared_ptr<Screen> >::const_iterator i = _screens.begin(); i != _screens.end(); ++i) {
-               f << "screen " << (*i)->as_metadata () << "\n";
-       }
-
        f << "tms_ip " << _tms_ip << "\n";
        f << "tms_path " << _tms_path << "\n";
        f << "tms_user " << _tms_user << "\n";
        f << "tms_password " << _tms_password << "\n";
        f << "sound_processor " << _sound_processor->id ();
 }
+
+string
+Config::default_directory_or (string a) const
+{
+       if (_default_directory.empty() || !boost::filesystem::exists (_default_directory)) {
+               return a;
+       }
+
+       return _default_directory;
+}