X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=6f366257cf7556648d6401f20a00262d604fc319;hb=692f9e2951a8bf600f95bb0b76c18df71c881504;hp=c9a530aafeb3569cc7b6d188a55059c5c70a61ec;hpb=dd8a7d1bbb8f2afb1b98d2be856ff0a9920e180d;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index c9a530aaf..6f366257c 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -85,6 +85,8 @@ using std::set_terminate;
 using boost::shared_ptr;
 using boost::thread;
 using boost::optional;
+using boost::lexical_cast;
+using boost::bad_lexical_cast;
 using dcp::Size;
 
 /** Path to our executable, required by the stacktrace stuff and filled
@@ -389,6 +391,11 @@ dcpomatic_setup_gettext_i18n (string lang)
 
 	setlocale (LC_ALL, "");
 	textdomain ("libdcpomatic2");
+	/* This sets up the locale to be used by lexical_cast (and probably other stuff);
+	   used by e.g. the audio gain calculator dialogue where we lexical_cast floating
+	   point values.
+	*/
+	std::locale::global (std::locale (""));
 
 #if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX)
 	bindtextdomain ("libdcpomatic2", mo_path().string().c_str());
@@ -474,7 +481,7 @@ ensure_ui_thread ()
 string
 audio_channel_name (int c)
 {
-	DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 12);
+	DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16);
 
 	/// TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency
 	/// enhancement channel (sub-woofer).  HI is the hearing-impaired audio track and
@@ -492,6 +499,10 @@ audio_channel_name (int c)
 		_("Right centre"),
 		_("Left rear surround"),
 		_("Right rear surround"),
+		_("D-BOX primary"),
+		_("D-BOX secondary"),
+		_("Unused"),
+		_("Unused")
 	};
 
 	return channels[c];
@@ -556,22 +567,6 @@ wrapped_av_malloc (size_t s)
 	return p;
 }
 
-FFmpegSubtitlePeriod
-subtitle_period (AVSubtitle const & sub)
-{
-	ContentTime const packet_time = ContentTime::from_seconds (static_cast<double> (sub.pts) / AV_TIME_BASE);
-
-	if (sub.end_display_time == static_cast<uint32_t> (-1)) {
-		/* End time is not known */
-		return FFmpegSubtitlePeriod (packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3));
-	}
-
-	return FFmpegSubtitlePeriod (
-		packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3),
-		packet_time + ContentTime::from_seconds (sub.end_display_time / 1e3)
-		);
-}
-
 map<string, string>
 split_get_request (string url)
 {
@@ -629,3 +624,21 @@ audio_asset_filename (shared_ptr<dcp::SoundAsset> asset)
 {
 	return "pcm_" + asset->id() + ".mxf";
 }
+
+float
+relaxed_string_to_float (string s)
+{
+	try {
+		boost::algorithm::replace_all (s, ",", ".");
+		return lexical_cast<float> (s);
+	} catch (bad_lexical_cast) {
+		boost::algorithm::replace_all (s, ".", ",");
+		return lexical_cast<float> (s);
+	}
+}
+
+bool
+string_not_empty (string s)
+{
+	return !s.empty ();
+}