diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-09 20:35:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-09 20:35:39 +0100 |
| commit | 89115db77729a2c99f1a09ff6a461720e16f889e (patch) | |
| tree | e528ec014b820d4e0efa28893dcee91cd76ee618 /src/lib/config.cc | |
| parent | f8ad440cf187c517b7800f3efdfc0954025c4422 (diff) | |
| parent | d2ff6a6b0256e256b6df416f280c846072f7682f (diff) | |
Merge master.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index c9ec730f2..e0fbcc703 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -38,6 +38,7 @@ using std::ifstream; using std::string; using std::ofstream; using std::list; +using std::max; using boost::shared_ptr; using boost::lexical_cast; using boost::optional; @@ -46,7 +47,7 @@ Config* Config::_instance = 0; /** Construct default configuration */ Config::Config () - : _num_local_encoding_threads (2) + : _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency())) , _server_port (6192) , _tms_path (N_(".")) , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750"))) |