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

diff --git a/src/lib/util.cc b/src/lib/util.cc
index c9a530aaf..f3795c264 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"
@@ -45,6 +46,9 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 }
 #include <curl/curl.h>
+#ifdef DCPOMATIC_GRAPHICS_MAGICK
+#include <Magick++.h>
+#endif
 #include <glib.h>
 #include <pangomm/init.h>
 #include <boost/algorithm/string.hpp>
@@ -85,6 +89,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
@@ -133,8 +139,8 @@ seconds_to_approximate_hms (int s)
 	SafeStringStream ap;
 
 	bool const hours = h > 0;
-	bool const minutes = h < 10 && m > 0;
-	bool const seconds = m < 10 && s > 0;
+	bool const minutes = h < 6 && m > 0;
+	bool const seconds = h == 0 && m < 10 && s > 0;
 
 	if (hours) {
 		if (m > 30 && !minutes) {
@@ -145,7 +151,7 @@ seconds_to_approximate_hms (int s)
 			ap << h << _("h");
 		}
 
-		if (minutes | seconds) {
+		if (minutes || seconds) {
 			ap << N_(" ");
 		}
 	}
@@ -343,6 +349,10 @@ dcpomatic_setup ()
 
 	curl_global_init (CURL_GLOBAL_ALL);
 
+#ifdef DCPOMATIC_GRAPHICS_MAGICK
+	Magick::InitializeMagick (0);
+#endif
+
 	ui_thread = boost::this_thread::get_id ();
 }
 
@@ -402,10 +412,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;
@@ -474,7 +484,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 +502,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 +570,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 +627,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 ();
+}