X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=e497ecf3c8a36a6d0fe9d5f3e04b2d0839405c7a;hb=92984df6ab50ba4ec90d105e44b58efa863c4b59;hp=da45919b426df35dd6c7943673267d5307f25ae1;hpb=73654117144c6de0ec4efe39ddc88485df546cc9;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index da45919b4..e497ecf3c 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -36,7 +36,9 @@
 #include "digester.h"
 #include "audio_processor.h"
 #include "compose.hpp"
+#include <dcp/locale_convert.h>
 #include <dcp/util.h>
+#include <dcp/raw_convert.h>
 #include <dcp/picture_asset.h>
 #include <dcp/sound_asset.h>
 #include <dcp/subtitle_asset.h>
@@ -92,6 +94,7 @@ using boost::lexical_cast;
 using boost::bad_lexical_cast;
 using dcp::Size;
 using dcp::raw_convert;
+using dcp::locale_convert;
 
 /** Path to our executable, required by the stacktrace stuff and filled
  *  in during App::onInit().
@@ -140,10 +143,10 @@ seconds_to_approximate_hms (int s)
 	if (hours) {
 		if (m > 30 && !minutes) {
 			/// TRANSLATORS: h here is an abbreviation for hours
-			ap += raw_convert<string>(h + 1) + _("h");
+			ap += locale_convert<string>(h + 1) + _("h");
 		} else {
 			/// TRANSLATORS: h here is an abbreviation for hours
-			ap += raw_convert<string>(h) + _("h");
+			ap += locale_convert<string>(h) + _("h");
 		}
 
 		if (minutes || seconds) {
@@ -155,10 +158,10 @@ seconds_to_approximate_hms (int s)
 		/* Minutes */
 		if (s > 30 && !seconds) {
 			/// TRANSLATORS: m here is an abbreviation for minutes
-			ap += raw_convert<string>(m + 1) + _("m");
+			ap += locale_convert<string>(m + 1) + _("m");
 		} else {
 			/// TRANSLATORS: m here is an abbreviation for minutes
-			ap += raw_convert<string>(m) + _("m");
+			ap += locale_convert<string>(m) + _("m");
 		}
 
 		if (seconds) {
@@ -169,7 +172,7 @@ seconds_to_approximate_hms (int s)
 	if (seconds) {
 		/* Seconds */
 		/// TRANSLATORS: s here is an abbreviation for seconds
-		ap += raw_convert<string>(s) + _("s");
+		ap += locale_convert<string>(s) + _("s");
 	}
 
 	return ap;
@@ -419,7 +422,7 @@ digest_head_tail (vector<boost::filesystem::path> files, boost::uintmax_t size)
 	while (i < int64_t (files.size()) && to_do > 0) {
 		FILE* f = fopen_boost (files[i], "rb");
 		if (!f) {
-			throw OpenFileError (files[i].string());
+			throw OpenFileError (files[i].string(), errno, true);
 		}
 
 		boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i]));
@@ -439,7 +442,7 @@ digest_head_tail (vector<boost::filesystem::path> files, boost::uintmax_t size)
 	while (i >= 0 && to_do > 0) {
 		FILE* f = fopen_boost (files[i], "rb");
 		if (!f) {
-			throw OpenFileError (files[i].string());
+			throw OpenFileError (files[i].string(), errno, true);
 		}
 
 		boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i]));
@@ -616,13 +619,12 @@ video_asset_filename (shared_ptr<dcp::PictureAsset> asset, int reel_index, int r
 {
 	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";
+	return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
 }
 
 string
@@ -630,13 +632,12 @@ audio_asset_filename (shared_ptr<dcp::SoundAsset> asset, int reel_index, int ree
 {
 	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";
+	return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
 }
 
 float