X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=ad132437a02ac0b47707c659455a1eeda107687c;hb=7d262f9be3a4c5d8da07dce42f7e2da708f6c7f4;hp=711963a26068c78b9df207a987252932932283d2;hpb=63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 711963a26..ad132437a 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -25,10 +25,11 @@
 #include "config.h"
 #include "server.h"
 #include "scaler.h"
-#include "screen.h"
 #include "filter.h"
 #include "sound_processor.h"
 
+#include "i18n.h"
+
 using std::vector;
 using std::ifstream;
 using std::string;
@@ -41,12 +42,17 @@ 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"))
+	, _reference_scaler (Scaler::from_id (N_("bicubic")))
+	, _tms_path (N_("."))
+	, _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
 {
+	_allowed_dcp_frame_rates.push_back (24);
+	_allowed_dcp_frame_rates.push_back (25);
+	_allowed_dcp_frame_rates.push_back (30);
+	_allowed_dcp_frame_rates.push_back (48);
+	_allowed_dcp_frame_rates.push_back (50);
+	_allowed_dcp_frame_rates.push_back (60);
+	
 	ifstream f (file().c_str ());
 	string line;
 	while (getline (f, line)) {
@@ -66,36 +72,34 @@ Config::Config ()
 		string const k = line.substr (0, s);
 		string const v = line.substr (s + 1);
 
-		if (k == "num_local_encoding_threads") {
+		if (k == N_("num_local_encoding_threads")) {
 			_num_local_encoding_threads = atoi (v.c_str ());
-		} else if (k == "server_port") {
+		} else if (k == N_("default_directory")) {
+			_default_directory = v;
+		} else if (k == N_("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") {
+		} else if (k == N_("reference_scaler")) {
 			_reference_scaler = Scaler::from_id (v);
-		} else if (k == "reference_filter") {
+		} else if (k == N_("reference_filter")) {
 			_reference_filters.push_back (Filter::from_id (v));
-		} else if (k == "server") {
+		} else if (k == N_("server")) {
 			_servers.push_back (ServerDescription::create_from_metadata (v));
-		} else if (k == "screen") {
-			_screens.push_back (Screen::create_from_metadata (v));
-		} else if (k == "tms_ip") {
+		} else if (k == N_("tms_ip")) {
 			_tms_ip = v;
-		} else if (k == "tms_path") {
+		} else if (k == N_("tms_path")) {
 			_tms_path = v;
-		} else if (k == "tms_user") {
+		} else if (k == N_("tms_user")) {
 			_tms_user = v;
-		} else if (k == "tms_password") {
+		} else if (k == N_("tms_password")) {
 			_tms_password = v;
-		} else if (k == "sound_processor") {
+		} else if (k == N_("sound_processor")) {
 			_sound_processor = SoundProcessor::from_id (v);
+		} else if (k == "language") {
+			_language = v;
 		}
-	}
 
-	Changed ();
+		_default_dci_metadata.read (k, v);
+	}
 }
 
 /** @return Filename to write configuration to */
@@ -104,7 +108,7 @@ Config::file () const
 {
 	boost::filesystem::path p;
 	p /= g_get_user_config_dir ();
-	p /= ".dvdomatic";
+	p /= N_(".dvdomatic");
 	return p.string ();
 }
 
@@ -124,27 +128,42 @@ void
 Config::write () const
 {
 	ofstream f (file().c_str ());
-	f << "num_local_encoding_threads " << _num_local_encoding_threads << "\n"
-	  << "server_port " << _server_port << "\n"
-	  << "colour_lut_index " << _colour_lut_index << "\n"
-	  << "j2k_bandwidth " << _j2k_bandwidth << "\n"
-	  << "reference_scaler " << _reference_scaler->id () << "\n";
+	f << N_("num_local_encoding_threads ") << _num_local_encoding_threads << N_("\n")
+	  << N_("default_directory ") << _default_directory << N_("\n")
+	  << N_("server_port ") << _server_port << N_("\n");
+
+	if (_reference_scaler) {
+		f << "reference_scaler " << _reference_scaler->id () << "\n";
+	}
 
 	for (vector<Filter const *>::const_iterator i = _reference_filters.begin(); i != _reference_filters.end(); ++i) {
-		f << "reference_filter " << (*i)->id () << "\n";
+		f << N_("reference_filter ") << (*i)->id () << N_("\n");
 	}
 	
 	for (vector<ServerDescription*>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
-		f << "server " << (*i)->as_metadata () << "\n";
+		f << N_("server ") << (*i)->as_metadata () << N_("\n");
 	}
 
-	for (vector<shared_ptr<Screen> >::const_iterator i = _screens.begin(); i != _screens.end(); ++i) {
-		f << "screen " << (*i)->as_metadata () << "\n";
+	f << N_("tms_ip ") << _tms_ip << N_("\n");
+	f << N_("tms_path ") << _tms_path << N_("\n");
+	f << N_("tms_user ") << _tms_user << N_("\n");
+	f << N_("tms_password ") << _tms_password << N_("\n");
+	if (_sound_processor) {
+		f << "sound_processor " << _sound_processor->id () << "\n";
+	}
+	if (_language) {
+		f << "language " << _language.get() << "\n";
+	}
+
+	_default_dci_metadata.write (f);
+}
+
+string
+Config::default_directory_or (string a) const
+{
+	if (_default_directory.empty() || !boost::filesystem::exists (_default_directory)) {
+		return a;
 	}
 
-	f << "tms_ip " << _tms_ip << "\n";
-	f << "tms_path " << _tms_path << "\n";
-	f << "tms_user " << _tms_user << "\n";
-	f << "tms_password " << _tms_password << "\n";
-	f << "sound_processor " << _sound_processor->id ();
+	return _default_directory;
 }