projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add disk writer tool.
[dcpomatic.git]
/
src
/
lib
/
state.cc
diff --git
a/src/lib/state.cc
b/src/lib/state.cc
index abb1976951e9f5b62daccb8e7fe2674da17b45d1..dd48516f43fc05a384089c543a8b60a12896ea5f 100644
(file)
--- a/
src/lib/state.cc
+++ b/
src/lib/state.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018
-2020
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-19,6
+19,7
@@
*/
#include "state.h"
*/
#include "state.h"
+#include "cross.h"
#include <glib.h>
using std::string;
#include <glib.h>
using std::string;
@@
-34,16
+35,7
@@
State::path (string file, bool create_directories)
if (override_path) {
p = *override_path;
} else {
if (override_path) {
p = *override_path;
} else {
-#ifdef DCPOMATIC_OSX
- p /= g_get_home_dir ();
- p /= "Library";
- p /= "Preferences";
- p /= "com.dcpomatic";
- p /= "2";
-#else
- p /= g_get_user_config_dir ();
- p /= "dcpomatic2";
-#endif
+ p = config_path ();
}
boost::system::error_code ec;
if (create_directories) {
}
boost::system::error_code ec;
if (create_directories) {