projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 1.0 in.
[dcpomatic.git]
/
src
/
lib
/
config.cc
diff --git
a/src/lib/config.cc
b/src/lib/config.cc
index 9f981c61918b111874858a1af5847a8b8c8c174b..5b96d108ccdfdd51a9d08595eb1e6c0c9b9d710b 100644
(file)
--- a/
src/lib/config.cc
+++ b/
src/lib/config.cc
@@
-135,6
+135,7
@@
Config::read_old_metadata ()
{
ifstream f (file(true).c_str ());
string line;
{
ifstream f (file(true).c_str ());
string line;
+
while (getline (f, line)) {
if (line.empty ()) {
continue;
while (getline (f, line)) {
if (line.empty ()) {
continue;
@@
-207,6
+208,17
@@
Config::file (bool old) const
return p.string ();
}
return p.string ();
}
+string
+Config::crypt_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 Singleton instance */
Config *
Config::instance ()
/** @return Singleton instance */
Config *
Config::instance ()