X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=1cf71ba32090a40963363d8abc37d065c9160124;hb=ada96204dfa1456da77e2ea7469f492cfc0a5483;hp=a6f38147fc8ae7d72d1d0e0e92a9fea8b751a1f0;hpb=1f443a0dc2b79915696a5f789b402c8cfc363d57;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index a6f38147f..1cf71ba32 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -1,19 +1,20 @@
 /*
     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,10 +33,10 @@
 #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"
+#include <locked_sstream.h>
 #include <dcp/util.h>
 #include <dcp/picture_asset.h>
 #include <dcp/sound_asset.h>
@@ -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>
@@ -111,7 +115,7 @@ seconds_to_hms (int s)
 	int h = m / 60;
 	m -= (h * 60);
 
-	SafeStringStream hms;
+	locked_stringstream hms;
 	hms << h << N_(":");
 	hms.width (2);
 	hms << setfill ('0') << m << N_(":");
@@ -132,11 +136,11 @@ seconds_to_approximate_hms (int s)
 	int h = m / 60;
 	m -= (h * 60);
 
-	SafeStringStream ap;
+	locked_stringstream 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) {
@@ -147,7 +151,7 @@ seconds_to_approximate_hms (int s)
 			ap << h << _("h");
 		}
 
-		if (minutes | seconds) {
+		if (minutes || seconds) {
 			ap << N_(" ");
 		}
 	}
@@ -345,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 ();
 }
 
@@ -404,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;
@@ -609,15 +617,31 @@ split_get_request (string url)
 }
 
 string
-video_asset_filename (shared_ptr<dcp::PictureAsset> asset)
+video_asset_filename (shared_ptr<dcp::PictureAsset> asset, int reel_index, int reel_count, optional<string> summary)
 {
-	return "j2c_" + asset->id() + ".mxf";
+	dcp::NameFormat::Map values;
+	values['t'] = "j2c";
+	values['i'] = asset->id();
+	values['r'] = raw_convert<string> (reel_index + 1);
+	values['n'] = raw_convert<string> (reel_count);
+	if (summary) {
+		values['c'] = summary.get();
+	}
+	return Config::instance()->dcp_asset_filename_format().get(values) + ".mxf";
 }
 
 string
-audio_asset_filename (shared_ptr<dcp::SoundAsset> asset)
+audio_asset_filename (shared_ptr<dcp::SoundAsset> asset, int reel_index, int reel_count, optional<string> summary)
 {
-	return "pcm_" + asset->id() + ".mxf";
+	dcp::NameFormat::Map values;
+	values['t'] = "pcm";
+	values['i'] = asset->id();
+	values['r'] = raw_convert<string> (reel_index + 1);
+	values['n'] = raw_convert<string> (reel_count);
+	if (summary) {
+		values['c'] = summary.get();
+	}
+	return Config::instance()->dcp_asset_filename_format().get(values) + ".mxf";
 }
 
 float