diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-09-19 15:07:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-09-19 15:07:03 +0100 |
| commit | f98c4cdec82fc2fbdcc4ca19748d09b0ea0556b4 (patch) | |
| tree | 82e1fd2170c3e9ca246c464086d96ec809dc128f /src/lib/config.cc | |
| parent | 98fd67b22129cefc6995cae6bc5b958a886e2e0c (diff) | |
Some boost::filesystem::path cleanups; tweak for changes to libdcp.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 5b96d108c..7d945c897 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -193,7 +193,7 @@ Config::read_old_metadata () } /** @return Filename to write configuration to */ -string +boost::filesystem::path Config::file (bool old) const { boost::filesystem::path p; @@ -205,18 +205,18 @@ Config::file (bool old) const } else { p /= "dcpomatic.xml"; } - return p.string (); + return p; } -string -Config::crypt_chain_directory () const +boost::filesystem::path +Config::signer_chain_directory () const { boost::filesystem::path p; p /= g_get_user_config_dir (); p /= "dvdomatic"; p /= "crypt"; boost::filesystem::create_directories (p); - return p.string (); + return p; } /** @return Singleton instance */ @@ -245,7 +245,7 @@ Config::write () const xmlpp::Element* root = doc.create_root_node ("Config"); 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("DefaultDirectory")->add_child_text (_default_directory.string ()); root->add_child("ServerPort")->add_child_text (lexical_cast<string> (_server_port)); for (vector<ServerDescription>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) { @@ -280,11 +280,11 @@ Config::write () const i->as_xml (root->add_child ("ColourConversion")); } - doc.write_to_file_formatted (file (false)); + doc.write_to_file_formatted (file(false).string ()); } -string -Config::default_directory_or (string a) const +boost::filesystem::path +Config::default_directory_or (boost::filesystem::path a) const { if (_default_directory.empty() || !boost::filesystem::exists (_default_directory)) { return a; |