diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-01-14 20:33:50 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-01-14 20:33:50 +0000 |
| commit | 3031638f0ddf23654b72af2088a7616791307310 (patch) | |
| tree | 4d0bbdaf3e2a5317c8e5d36a08241e5ba2b63f09 /src/lib/config.cc | |
| parent | fad726e94700bccdae0d301d54cdb1eab51cc71f (diff) | |
| parent | b9ee74b24dad91e3fee9ead44ea9a52328b20f25 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index fe50a5cc2..848e466a6 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -42,8 +42,6 @@ Config* Config::_instance = 0; Config::Config () : _num_local_encoding_threads (2) , _server_port (6192) - , _colour_lut_index (0) - , _j2k_bandwidth (250000000) , _reference_scaler (Scaler::from_id ("bicubic")) , _tms_path (".") , _sound_processor (SoundProcessor::from_id ("dolby_cp750")) @@ -76,10 +74,6 @@ Config::Config () _default_directory = v; } else if (k == "server_port") { _server_port = atoi (v.c_str ()); - } else if (k == "colour_lut_index") { - _colour_lut_index = atoi (v.c_str ()); - } else if (k == "j2k_bandwidth") { - _j2k_bandwidth = atoi (v.c_str ()); } else if (k == "reference_scaler") { _reference_scaler = Scaler::from_id (v); } else if (k == "reference_filter") { @@ -170,8 +164,6 @@ Config::write () const f << "num_local_encoding_threads " << _num_local_encoding_threads << "\n" << "default_directory " << _default_directory << "\n" << "server_port " << _server_port << "\n" - << "colour_lut_index " << _colour_lut_index << "\n" - << "j2k_bandwidth " << _j2k_bandwidth << "\n" << "reference_scaler " << _reference_scaler->id () << "\n"; for (vector<Filter const *>::const_iterator i = _reference_filters.begin(); i != _reference_filters.end(); ++i) { |