summaryrefslogtreecommitdiff
path: root/src/lib/config.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-04-14 20:17:35 +0100
committerCarl Hetherington <cth@carlh.net>2019-04-14 20:17:35 +0100
commit985e727e001e1a92ae035364a9cbf1ff99522ff1 (patch)
tree00732404f32b4aae2eed4ca8693b8e01f75671d9 /src/lib/config.h
parente21c0de24a7b2a2f9a2cf686e2ef59b155947420 (diff)
Store successful DCP encodes.
Diffstat (limited to 'src/lib/config.h')
-rw-r--r--src/lib/config.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/config.h b/src/lib/config.h
index a982c9727..8cc25d737 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -27,6 +27,7 @@
#include "isdcf_metadata.h"
#include "types.h"
+#include "state.h"
#include "edid.h"
#include <dcp/name_format.h>
#include <dcp/certificate_chain.h>
@@ -46,7 +47,7 @@ class DKDMGroup;
/** @class Config
* @brief A singleton class holding configuration.
*/
-class Config : public boost::noncopyable
+class Config : public State
{
public:
/** @return number of threads which a master DoM should use for J2K encoding on the local machine */
@@ -1094,10 +1095,6 @@ public:
static void restore_defaults ();
static bool have_existing (std::string);
static boost::filesystem::path config_file ();
- static boost::filesystem::path path (std::string file, bool create_directories = true);
-
- /** If set, this overrides the standard path (in home, Library, AppData or wherever) for config.xml and cinemas.xml */
- static boost::optional<boost::filesystem::path> override_path;
private:
Config ();