diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-18 00:48:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-18 00:48:13 +0100 |
| commit | 853f658e8a95ece236438eb8e91860360e0624af (patch) | |
| tree | e513c3d778f8a1da3eab214b716751323ee3ea6f /src/lib | |
| parent | 272868a09ab7b7bd4bd9c0c531aab306feaa8b07 (diff) | |
Try to make Windows console appearance a preference.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 9 | ||||
| -rw-r--r-- | src/lib/config.h | 16 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index d624e6070..2b7b81cfe 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -76,6 +76,9 @@ Config::Config () , _check_for_test_updates (false) , _maximum_j2k_bandwidth (250000000) , _log_types (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR) +#ifdef DCPOMATIC_WINDOWS + , _win32_console (false) +#endif { _allowed_dcp_frame_rates.push_back (24); _allowed_dcp_frame_rates.push_back (25); @@ -219,6 +222,9 @@ Config::read () _allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate"); _log_types = f.optional_number_child<int> ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR); +#ifdef DCPOMATIC_WINDOWS + _win32_console = f.optional_bool_child ("Win32Console").get_value_or (false); +#endif list<cxml::NodePtr> his = f.node_children ("History"); for (list<cxml::NodePtr>::const_iterator i = his.begin(); i != his.end(); ++i) { @@ -363,6 +369,9 @@ Config::write () const root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert<string> (_maximum_j2k_bandwidth)); root->add_child("AllowAnyDCPFrameRate")->add_child_text (_allow_any_dcp_frame_rate ? "1" : "0"); root->add_child("LogTypes")->add_child_text (raw_convert<string> (_log_types)); +#ifdef DCPOMATIC_WINDOWS + root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0"); +#endif xmlpp::Element* signer = root->add_child ("Signer"); dcp::CertificateChain::List certs = _signer->certificates().root_to_leaf (); diff --git a/src/lib/config.h b/src/lib/config.h index 3cc7c49c4..55a172d78 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -223,6 +223,12 @@ public: return _log_types; } +#ifdef DCPOMATIC_WINDOWS + bool win32_console () const { + return _win32_console; + } +#endif + std::vector<boost::filesystem::path> history () const { return _history; } @@ -420,6 +426,13 @@ public: changed (); } +#ifdef DCPOMATIC_WINDOWS + void set_win32_console (bool c) { + _win32_console = c; + changed (); + } +#endif + void clear_history () { _history.clear (); changed (); @@ -494,6 +507,9 @@ private: /** maximum allowed J2K bandwidth in bits per second */ int _maximum_j2k_bandwidth; int _log_types; +#ifdef DCPOMATIC_WINDOWS + bool _win32_console; +#endif std::vector<boost::filesystem::path> _history; /** Singleton instance, or 0 */ |