X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=307b9684414359ffb823a937f3febc515711db84;hb=039ac5848730d154e0b3f3dd841a55e45ba922d8;hp=d19adc2a41886e4fd7dd7c46eb569b6f4eece5d9;hpb=288e7e64e9be84b8dbe11f5acb490e64a29d9378;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index d19adc2a4..307b96844 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -40,12 +40,14 @@ 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"))
 {
+	_allowed_dcp_frame_rates.push_back (24);
+	_allowed_dcp_frame_rates.push_back (25);
+	_allowed_dcp_frame_rates.push_back (30);
+	
 	ifstream f (file().c_str ());
 	string line;
 	while (getline (f, line)) {
@@ -71,10 +73,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") {
@@ -124,8 +122,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) {