projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge writer-thread with original which was time-cleanup.
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index 62fcebbc3e03aa9836642f58a26ae6733d5297d9..c41437efbe290f6aacad37ec5387fd21dc4d99db 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-26,12
+26,12
@@
#include <vector>
#include <boost/shared_ptr.hpp>
#include <vector>
#include <boost/shared_ptr.hpp>
-#include <
sigc++/signal.h
>
+#include <
boost/signals2.hpp
>
-class Server;
-class Screen;
+class ServerDescription;
class Scaler;
class Filter;
class Scaler;
class Filter;
+class SoundProcessor;
/** @class Config
* @brief A singleton class holding configuration.
/** @class Config
* @brief A singleton class holding configuration.
@@
-45,34
+45,22
@@
public:
return _num_local_encoding_threads;
}
return _num_local_encoding_threads;
}
- /** @return port to use for J2K encoding servers */
- int server_port () const {
- return _server_port;
+ std::string default_directory () const {
+ return _default_directory;
}
}
- /** @return index of colour LUT to use when converting RGB to XYZ.
- * 0: sRGB
- * 1: Rec 709
- * 2: DC28
- */
- int colour_lut_index () const {
- return _colour_lut_index;
- }
+ std::string default_directory_or (std::string a) const;
- /** @return
bandwidth for J2K files in bits per second
*/
- int
j2k_bandwidth
() const {
- return _
j2k_bandwidth
;
+ /** @return
port to use for J2K encoding servers
*/
+ int
server_port
() const {
+ return _
server_port
;
}
/** @return J2K encoding servers to use */
}
/** @return J2K encoding servers to use */
- std::vector<Server*> servers () const {
+ std::vector<Server
Description
*> servers () const {
return _servers;
}
return _servers;
}
- std::vector<boost::shared_ptr<Screen> > screens () const {
- return _screens;
- }
-
Scaler const * reference_scaler () const {
return _reference_scaler;
}
Scaler const * reference_scaler () const {
return _reference_scaler;
}
@@
-81,90
+69,87
@@
public:
return _reference_filters;
}
return _reference_filters;
}
+ /** @return The IP address of a TMS that we can copy DCPs to */
std::string tms_ip () const {
return _tms_ip;
}
std::string tms_ip () const {
return _tms_ip;
}
+ /** @return The path on a TMS that we should write DCPs to */
std::string tms_path () const {
return _tms_path;
}
std::string tms_path () const {
return _tms_path;
}
+ /** @return User name to log into the TMS with */
std::string tms_user () const {
return _tms_user;
}
std::string tms_user () const {
return _tms_user;
}
+ /** @return Password to log into the TMS with */
std::string tms_password () const {
return _tms_password;
}
std::string tms_password () const {
return _tms_password;
}
+ /** @return The sound processor that we are using */
+ SoundProcessor const * sound_processor () const {
+ return _sound_processor;
+ }
+
+ std::list<int> allowed_dcp_frame_rates () const {
+ return _allowed_dcp_frame_rates;
+ }
+
/** @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;
- Changed ();
- }
-
- /** @param p New server port */
- void set_sever_port (int p) {
- _server_port = p;
- Changed ();
}
}
- /** @param i New colour LUT index */
- void set_colour_lut_index (int i) {
- _colour_lut_index = i;
- Changed ();
+ void set_default_directory (std::string d) {
+ _default_directory = d;
}
}
- /** @param b New J2K bandwidth */
- void set_j2k_bandwidth (int b) {
- _j2k_bandwidth = b;
- Changed ();
+ /** @param p New server port */
+ void set_server_port (int p) {
+ _server_port = p;
}
/** @param s New list of servers */
}
/** @param s New list of servers */
- void set_servers (std::vector<Server*> s) {
+ void set_servers (std::vector<Server
Description
*> s) {
_servers = s;
_servers = s;
- Changed ();
- }
-
- void set_screens (std::vector<boost::shared_ptr<Screen> > s) {
- _screens = s;
- Changed ();
}
void set_reference_scaler (Scaler const * s) {
_reference_scaler = s;
}
void set_reference_scaler (Scaler const * s) {
_reference_scaler = s;
- Changed ();
}
void set_reference_filters (std::vector<Filter const *> const & f) {
_reference_filters = f;
}
void set_reference_filters (std::vector<Filter const *> const & f) {
_reference_filters = f;
- Changed ();
}
}
+ /** @param i IP address of a TMS that we can copy DCPs to */
void set_tms_ip (std::string i) {
_tms_ip = i;
void set_tms_ip (std::string i) {
_tms_ip = i;
- Changed ();
}
}
+ /** @param p Path on a TMS that we should write DCPs to */
void set_tms_path (std::string p) {
_tms_path = p;
void set_tms_path (std::string p) {
_tms_path = p;
- Changed ();
}
}
+ /** @param u User name to log into the TMS with */
void set_tms_user (std::string u) {
_tms_user = u;
void set_tms_user (std::string u) {
_tms_user = u;
- Changed ();
}
}
+ /** @param p Password to log into the TMS with */
void set_tms_password (std::string p) {
_tms_password = p;
void set_tms_password (std::string p) {
_tms_password = p;
- Changed ();
}
}
-
- void write () const;
- sigc::signal0<void> Changed;
+ void set_allowed_dcp_frame_rates (std::list<int> const & r) {
+ _allowed_dcp_frame_rates = r;
+ }
+
+ void write () const;
static Config* instance ();
static Config* instance ();
@@
-174,31
+159,28
@@
private:
/** 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;
+ /** default directory to put new films in */
+ std::string _default_directory;
/** port to use for J2K encoding servers */
int _server_port;
/** port to use for J2K encoding servers */
int _server_port;
- /** index of colour LUT to use when converting RGB to XYZ
- * (see colour_lut_index ())
- */
- int _colour_lut_index;
- /** bandwidth for J2K files in Mb/s */
- int _j2k_bandwidth;
/** J2K encoding servers to use */
/** J2K encoding servers to use */
- std::vector<Server *> _servers;
-
- /** Screen definitions */
- std::vector<boost::shared_ptr<Screen> > _screens;
-
+ std::vector<ServerDescription *> _servers;
/** Scaler to use for the "A" part of A/B comparisons */
Scaler const * _reference_scaler;
/** Scaler to use for the "A" part of A/B comparisons */
Scaler const * _reference_scaler;
-
/** Filters to use for the "A" part of A/B comparisons */
std::vector<Filter const *> _reference_filters;
/** Filters to use for the "A" part of A/B comparisons */
std::vector<Filter const *> _reference_filters;
-
+ /** The IP address of a TMS that we can copy DCPs to */
std::string _tms_ip;
std::string _tms_ip;
+ /** The path on a TMS that we should write DCPs to */
std::string _tms_path;
std::string _tms_path;
+ /** User name to log into the TMS with */
std::string _tms_user;
std::string _tms_user;
+ /** Password to log into the TMS with */
std::string _tms_password;
std::string _tms_password;
+ /** Our sound processor */
+ SoundProcessor const * _sound_processor;
+ std::list<int> _allowed_dcp_frame_rates;
/** Singleton instance, or 0 */
static Config* _instance;
/** Singleton instance, or 0 */
static Config* _instance;