#include "digester.h"
#include "audio_processor.h"
#include "compose.hpp"
-#include <locked_sstream.h>
+#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>
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().
int h = m / 60;
m -= (h * 60);
- locked_stringstream hms;
- hms << h << N_(":");
- hms.width (2);
- hms << setfill ('0') << m << N_(":");
- hms.width (2);
- hms << setfill ('0') << s;
-
- return hms.str ();
+ char buffer[64];
+ snprintf (buffer, sizeof(buffer), "%d:%02d:%02d", h, m, s);
+ return buffer;
}
/** @param s Number of seconds.
int h = m / 60;
m -= (h * 60);
- locked_stringstream ap;
+ string ap;
bool const hours = h > 0;
bool const minutes = h < 6 && m > 0;
if (hours) {
if (m > 30 && !minutes) {
/// TRANSLATORS: h here is an abbreviation for hours
- ap << (h + 1) << _("h");
+ ap += locale_convert<string>(h + 1) + _("h");
} else {
/// TRANSLATORS: h here is an abbreviation for hours
- ap << h << _("h");
+ ap += locale_convert<string>(h) + _("h");
}
if (minutes || seconds) {
- ap << N_(" ");
+ ap += N_(" ");
}
}
/* Minutes */
if (s > 30 && !seconds) {
/// TRANSLATORS: m here is an abbreviation for minutes
- ap << (m + 1) << _("m");
+ ap += locale_convert<string>(m + 1) + _("m");
} else {
/// TRANSLATORS: m here is an abbreviation for minutes
- ap << m << _("m");
+ ap += locale_convert<string>(m) + _("m");
}
if (seconds) {
- ap << N_(" ");
+ ap += N_(" ");
}
}
if (seconds) {
/* Seconds */
/// TRANSLATORS: s here is an abbreviation for seconds
- ap << s << _("s");
+ ap += locale_convert<string>(s) + _("s");
}
- return ap.str ();
+ return ap;
}
double
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);
}
boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i]));
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);
}
boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i]));
{
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_filename_format().get(values) + ".mxf";
+ return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
}
string
{
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_filename_format().get(values) + ".mxf";
+ return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + ".mxf");
}
float