diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 13 | ||||
| -rw-r--r-- | src/lib/config.h | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 711963a26..50b5ae941 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -68,6 +68,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") { @@ -125,6 +127,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" @@ -148,3 +151,13 @@ Config::write () const 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; +} diff --git a/src/lib/config.h b/src/lib/config.h index 1ded015f2..59af8a07a 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -46,6 +46,12 @@ public: return _num_local_encoding_threads; } + std::string default_directory () const { + return _default_directory; + } + + std::string default_directory_or (std::string a) const; + /** @return port to use for J2K encoding servers */ int server_port () const { return _server_port; @@ -111,6 +117,11 @@ public: Changed (); } + void set_default_directory (std::string d) { + _default_directory = d; + Changed (); + } + /** @param p New server port */ void set_server_port (int p) { _server_port = p; @@ -186,6 +197,8 @@ private: /** number of threads to use for J2K encoding on the local machine */ int _num_local_encoding_threads; + /** default directory to put new films in */ + std::string _default_directory; /** port to use for J2K encoding servers */ int _server_port; /** index of colour LUT to use when converting RGB to XYZ |