X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=92b3b22fd1cd72096e96d5dece3e23bea23d20b5;hb=a306df9145d16046e51e8b7ff5222e341e98fdbd;hp=f434f358e38982c1ee7f6c3afe9b830d070c81a3;hpb=ea35bff04d7a96f44ea595951bb0c0dd54c8ee52;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index f434f358e..92b3b22fd 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -1,19 +1,20 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -32,7 +33,7 @@
 #include "cross.h"
 #include "video_content.h"
 #include "rect.h"
-#include "md5_digester.h"
+#include "digester.h"
 #include "audio_processor.h"
 #include "safe_stringstream.h"
 #include "compose.hpp"
@@ -85,6 +86,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,11 +392,6 @@ 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());
@@ -407,10 +405,10 @@ dcpomatic_setup_gettext_i18n (string lang)
 
 /** Compute a digest of the first and last `size' bytes of a set of files. */
 string
-md5_digest_head_tail (vector<boost::filesystem::path> files, boost::uintmax_t size)
+digest_head_tail (vector<boost::filesystem::path> files, boost::uintmax_t size)
 {
 	boost::scoped_array<char> buffer (new char[size]);
-	MD5Digester digester;
+	Digester digester;
 
 	/* Head */
 	boost::uintmax_t to_do = size;
@@ -622,3 +620,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 ();
+}