projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A few more fixes; set up Playlist as required.
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index c41437efbe290f6aacad37ec5387fd21dc4d99db..13d36d236da762fe7f9d9e999165b3c43f952fdb 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-27,6
+27,7
@@
#include <vector>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <vector>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
+#include "dci_metadata.h"
class ServerDescription;
class Scaler;
class ServerDescription;
class Scaler;
@@
-98,6
+99,14
@@
public:
return _allowed_dcp_frame_rates;
}
return _allowed_dcp_frame_rates;
}
+ DCIMetadata default_dci_metadata () const {
+ return _default_dci_metadata;
+ }
+
+ boost::optional<std::string> language () const {
+ return _language;
+ }
+
/** @param n New number of local encoding threads */
void set_num_local_encoding_threads (int n) {
_num_local_encoding_threads = n;
/** @param n New number of local encoding threads */
void set_num_local_encoding_threads (int n) {
_num_local_encoding_threads = n;
@@
-149,13
+158,27
@@
public:
_allowed_dcp_frame_rates = r;
}
_allowed_dcp_frame_rates = r;
}
+ void set_default_dci_metadata (DCIMetadata d) {
+ _default_dci_metadata = d;
+ }
+
+ void set_language (std::string l) {
+ _language = l;
+ }
+
+ void unset_language () {
+ _language = boost::none;
+ }
+
void write () const;
static Config* instance ();
void write () const;
static Config* instance ();
+ static void drop ();
private:
Config ();
private:
Config ();
- std::string file () const;
+ std::string file (bool) const;
+ void read_old_metadata ();
/** number of threads to use for J2K encoding on the local machine */
int _num_local_encoding_threads;
/** number of threads to use for J2K encoding on the local machine */
int _num_local_encoding_threads;
@@
-181,6
+204,9
@@
private:
/** Our sound processor */
SoundProcessor const * _sound_processor;
std::list<int> _allowed_dcp_frame_rates;
/** Our sound processor */
SoundProcessor const * _sound_processor;
std::list<int> _allowed_dcp_frame_rates;
+ /** Default DCI metadata for newly-created Films */
+ DCIMetadata _default_dci_metadata;
+ boost::optional<std::string> _language;
/** Singleton instance, or 0 */
static Config* _instance;
/** Singleton instance, or 0 */
static Config* _instance;