summaryrefslogtreecommitdiff
path: root/src/lib/config.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-08-08 10:24:09 +0100
committerCarl Hetherington <cth@carlh.net>2018-08-14 11:18:18 +0100
commit63b0d6b180a41547aee9028d200992f53c5a043f (patch)
treef7f7d4458db79e2f916548c37d6424e395ef481f /src/lib/config.h
parente65d31fbccad80c80f743516ecdd8269826d2114 (diff)
Basic stuff to count 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 dbe6a9c21..e5a4e5a9f 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 <dcp/name_format.h>
#include <dcp/certificate_chain.h>
#include <dcp/encrypted_kdm.h>
@@ -45,7 +46,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 */
@@ -801,12 +802,8 @@ public:
static bool have_existing (std::string);
static boost::filesystem::path config_file ();
- /** 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 ();
- static boost::filesystem::path path (std::string file, bool create_directories = true);
void read ();
void set_defaults ();
void set_kdm_email_to_default ();