X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=7a0f1a17aec65008bf2eea3585d0bebb5cf283c9;hb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;hp=d04f195aff6bbfdbb64b030dba3aed40f37bf0e2;hpb=9e4c091e6ef0f79fab10664e95240de2f14e5702;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index d04f195af..7a0f1a17a 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -22,7 +22,6 @@ * @brief Some utility functions and classes. */ -#include #include #include #include @@ -45,11 +44,15 @@ #include #include #include +#ifdef DCPOMATIC_IMAGE_MAGICK #include +#else +#include +#include +#endif #include #include #include -#include #include #include extern "C" { @@ -73,6 +76,7 @@ extern "C" { #include "rect.h" #include "md5_digester.h" #include "audio_processor.h" +#include "safe_stringstream.h" #ifdef DCPOMATIC_WINDOWS #include "stack.hpp" #endif @@ -80,7 +84,6 @@ extern "C" { #include "i18n.h" using std::string; -using std::stringstream; using std::setfill; using std::ostream; using std::endl; @@ -124,7 +127,7 @@ seconds_to_hms (int s) int h = m / 60; m -= (h * 60); - stringstream hms; + SafeStringStream hms; hms << h << N_(":"); hms.width (2); hms << std::setfill ('0') << m << N_(":"); @@ -145,26 +148,55 @@ seconds_to_approximate_hms (int s) int h = m / 60; m -= (h * 60); - stringstream ap; - - if (h > 0) { - if (m > 30) { + SafeStringStream ap; + + bool const hours = h > 0; + bool const minutes = h < 10 && m > 0; + bool const seconds = m < 10 && s > 0; + + if (hours) { + if (m > 30 && !minutes) { ap << (h + 1) << N_(" ") << _("hours"); } else { + ap << h << N_(" "); if (h == 1) { - ap << N_("1 ") << _("hour"); + ap << _("hour"); } else { - ap << h << N_(" ") << _("hours"); + ap << _("hours"); } } - } else if (m > 0) { - if (m == 1) { - ap << N_("1 ") << _("minute"); + + if (minutes | seconds) { + ap << N_(" "); + } + } + + if (minutes) { + /* Minutes */ + if (s > 30 && !seconds) { + ap << (m + 1) << N_(" ") << _("minutes"); } else { - ap << m << N_(" ") << _("minutes"); + ap << m << N_(" "); + if (m == 1) { + ap << _("minute"); + } else { + ap << _("minutes"); + } + } + + if (seconds) { + ap << N_(" "); + } + } + + if (seconds) { + /* Seconds */ + ap << s << N_(" "); + if (s == 1) { + ap << _("second"); + } else { + ap << _("seconds"); } - } else { - ap << s << N_(" ") << _("seconds"); } return ap.str (); @@ -235,7 +267,7 @@ stacktrace (ostream& out, int levels) static string ffmpeg_version_to_string (int v) { - stringstream s; + SafeStringStream s; s << ((v & 0xff0000) >> 16) << N_(".") << ((v & 0xff00) >> 8) << N_(".") << (v & 0xff); return s.str (); } @@ -356,35 +388,42 @@ mo_path () } #endif +#ifdef DCPOMATIC_OSX +boost::filesystem::path +mo_path () +{ + return "DCP-o-matic 2.app/Contents/Resources"; +} +#endif + void dcpomatic_setup_gettext_i18n (string lang) { -#ifdef DCPOMATIC_POSIX +#ifdef DCPOMATIC_LINUX lang += ".UTF8"; #endif if (!lang.empty ()) { - /* Override our environment language; this is essential on - Windows. + /* Override our environment language. Note that the caller must not + free the string passed into putenv(). */ - char cmd[64]; - snprintf (cmd, sizeof(cmd), "LANGUAGE=%s", lang.c_str ()); - putenv (cmd); - snprintf (cmd, sizeof(cmd), "LANG=%s", lang.c_str ()); - putenv (cmd); - snprintf (cmd, sizeof(cmd), "LC_ALL=%s", lang.c_str ()); - putenv (cmd); + string s = String::compose ("LANGUAGE=%1", lang); + putenv (strdup (s.c_str ())); + s = String::compose ("LANG=%1", lang); + putenv (strdup (s.c_str ())); + s = String::compose ("LC_ALL=%1", lang); + putenv (strdup (s.c_str ())); } setlocale (LC_ALL, ""); textdomain ("libdcpomatic"); -#ifdef DCPOMATIC_WINDOWS +#if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX) bindtextdomain ("libdcpomatic", mo_path().string().c_str()); bind_textdomain_codeset ("libdcpomatic", "UTF8"); #endif -#ifdef DCPOMATIC_POSIX +#ifdef DCPOMATIC_LINUX bindtextdomain ("libdcpomatic", POSIX_LOCALE_PREFIX); #endif } @@ -438,7 +477,10 @@ md5_digest (vector files, shared_ptr job) while (remaining > 0) { int const t = min (remaining, buffer_size); - fread (buffer, 1, t, f); + int const r = fread (buffer, 1, t, f); + if (r != t) { + throw ReadFileError (files[i], errno); + } digester.add (buffer, t); remaining -= t; @@ -528,7 +570,7 @@ Socket::accept (int port) _acceptor->async_accept (_socket, boost::lambda::var(ec) = boost::lambda::_1); do { _io_service.run_one (); - } while (ec == boost::asio::error::would_block ); + } while (ec == boost::asio::error::would_block); delete _acceptor; _acceptor = 0; @@ -608,6 +650,17 @@ stride_round_up (int c, int const * stride, int t) return a - (a % t); } +/** @param n A number. + * @param r Rounding `boundary' (must be a power of 2) + * @return n rounded to the nearest r + */ +int +round_to (float n, int r) +{ + assert (r == 1 || r == 2 || r == 4); + return int (n + float(r) / 2) &~ (r - 1); +} + /** Read a sequence of key / value pairs from a text stream; * the keys are the first words on the line, and the values are * the remainder of the line following the key. Lines beginning @@ -762,59 +815,6 @@ tidy_for_filename (string f) return t; } -shared_ptr -make_signer () -{ - boost::filesystem::path const sd = Config::instance()->signer_chain_directory (); - - /* Remake the chain if any of it is missing */ - - list files; - files.push_back ("ca.self-signed.pem"); - files.push_back ("intermediate.signed.pem"); - files.push_back ("leaf.signed.pem"); - files.push_back ("leaf.key"); - - list::const_iterator i = files.begin(); - while (i != files.end()) { - boost::filesystem::path p (sd); - p /= *i; - if (!boost::filesystem::exists (p)) { - boost::filesystem::remove_all (sd); - boost::filesystem::create_directories (sd); - dcp::make_signer_chain (sd, openssl_path ()); - break; - } - - ++i; - } - - dcp::CertificateChain chain; - - { - boost::filesystem::path p (sd); - p /= "ca.self-signed.pem"; - chain.add (shared_ptr (new dcp::Certificate (p))); - } - - { - boost::filesystem::path p (sd); - p /= "intermediate.signed.pem"; - chain.add (shared_ptr (new dcp::Certificate (p))); - } - - { - boost::filesystem::path p (sd); - p /= "leaf.signed.pem"; - chain.add (shared_ptr (new dcp::Certificate (p))); - } - - boost::filesystem::path signer_key (sd); - signer_key /= "leaf.key"; - - return shared_ptr (new dcp::Signer (chain, signer_key)); -} - map split_get_request (string url) { @@ -862,13 +862,13 @@ split_get_request (string url) } dcp::Size -fit_ratio_within (float ratio, dcp::Size full_frame) +fit_ratio_within (float ratio, dcp::Size full_frame, int round) { if (ratio < full_frame.ratio ()) { - return dcp::Size (rint (full_frame.height * ratio), full_frame.height); + return dcp::Size (round_to (full_frame.height * ratio, round), full_frame.height); } - return dcp::Size (full_frame.width, rint (full_frame.width / ratio)); + return dcp::Size (full_frame.width, round_to (full_frame.width / ratio, round)); } void * @@ -903,7 +903,7 @@ divide_with_round (int64_t a, int64_t b) string dependency_version_summary () { - stringstream s; + SafeStringStream s; s << N_("libopenjpeg ") << opj_version () << N_(", ") << N_("libavcodec ") << ffmpeg_version_to_string (avcodec_version()) << N_(", ") << N_("libavfilter ") << ffmpeg_version_to_string (avfilter_version()) << N_(", ")