X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=d36ae744fe1946d4b70cc2f7cdb7c463f3dc3a2e;hp=6ed66c40f27d14f3cc0dfd6c556b4a6f3c5b0d60;hb=HEAD;hpb=69957d093fd1cb798449271e6212cd86321d5528 diff --git a/src/lib/util.cc b/src/lib/util.cc index 6ed66c40f..fdc647fba 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -33,7 +33,6 @@ #include "config.h" #include "constants.h" #include "cross.h" -#include "crypto.h" #include "dcp_content_type.h" #include "dcpomatic_log.h" #include "digester.h" @@ -53,9 +52,12 @@ #include "video_content.h" #include #include +#include +#include #include #include #include +#include #include #include #include @@ -73,6 +75,7 @@ LIBDCP_ENABLE_WARNINGS #include #include #include +#include #include #include #include @@ -405,7 +408,6 @@ ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) } -static void capture_ffmpeg_logs() { @@ -446,7 +448,13 @@ LIBDCP_ENABLE_WARNINGS #ifdef DCPOMATIC_WINDOWS putenv ("PANGOCAIRO_BACKEND=fontconfig"); - putenv (String::compose("FONTCONFIG_PATH=%1", resources_path().string()).c_str()); + if (dcp::filesystem::exists(resources_path() / "fonts.conf")) { + /* The actual application after installation */ + putenv(String::compose("FONTCONFIG_PATH=%1", resources_path().string()).c_str()); + } else { + /* The place where fonts.conf is during tests */ + putenv("FONTCONFIG_PATH=build\\fonts"); + } #endif #ifdef DCPOMATIC_OSX @@ -459,12 +467,12 @@ LIBDCP_ENABLE_WARNINGS #if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX) /* Render something to fontconfig to create its cache */ - list subs; + vector subs; dcp::SubtitleString ss( optional(), false, false, false, dcp::Colour(), 42, 1, dcp::Time(), dcp::Time(), 0, dcp::HAlign::CENTER, 0, dcp::VAlign::CENTER, 0, dcp::Direction::LTR, - "Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time(), 0 + "Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time(), 0, std::vector() ); - subs.push_back(StringText(ss, 0, {}, dcp::SubtitleStandard::SMPTE_2014)); + subs.push_back(StringText(ss, 0, make_shared("foo"), dcp::SubtitleStandard::SMPTE_2014)); render_text (subs, dcp::Size(640, 480), DCPTime(), 24); #endif @@ -554,7 +562,7 @@ digest_head_tail (vector files, boost::uintmax_t size) throw OpenFileError (files[i].string(), errno, OpenFileError::READ); } - boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i])); + auto this_time = min(to_do, dcp::filesystem::file_size(files[i])); f.checked_read(p, this_time); p += this_time; to_do -= this_time; @@ -573,7 +581,7 @@ digest_head_tail (vector files, boost::uintmax_t size) throw OpenFileError (files[i].string(), errno, OpenFileError::READ); } - boost::uintmax_t this_time = min (to_do, boost::filesystem::file_size (files[i])); + auto this_time = min(to_do, dcp::filesystem::file_size(files[i])); f.seek(-this_time, SEEK_END); f.checked_read(p, this_time); p += this_time; @@ -590,7 +598,8 @@ digest_head_tail (vector files, boost::uintmax_t size) string simple_digest (vector paths) { - return digest_head_tail(paths, 1000000) + raw_convert(boost::filesystem::file_size(paths.front())); + DCP_ASSERT(!paths.empty()); + return digest_head_tail(paths, 1000000) + raw_convert(dcp::filesystem::file_size(paths.front())); } @@ -665,7 +674,7 @@ short_audio_channel_name (int c) bool valid_image_file (boost::filesystem::path f) { - if (boost::starts_with (f.leaf().string(), "._")) { + if (boost::starts_with(f.filename().string(), "._")) { return false; } @@ -682,7 +691,7 @@ valid_image_file (boost::filesystem::path f) bool valid_sound_file (boost::filesystem::path f) { - if (boost::starts_with (f.leaf().string(), "._")) { + if (boost::starts_with(f.filename().string(), "._")) { return false; } @@ -725,9 +734,9 @@ asset_filename (shared_ptr asset, string type, int reel_index, int r values['r'] = raw_convert(reel_index + 1); values['n'] = raw_convert(reel_count); if (summary) { - values['c'] = careful_string_filter(summary.get()); + values['c'] = summary.get(); } - return Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + extension); + return careful_string_filter(Config::instance()->dcp_asset_filename_format().get(values, "_" + asset->id() + extension)); } @@ -791,7 +800,7 @@ careful_string_filter (string s) /* Then remove anything that's not in a very limited character set */ wstring out; - wstring const allowed = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_%.+"; + wstring const allowed = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_.+"; for (int i = 0; i < transliterated_more.length(); ++i) { wchar_t c = transliterated_more[i]; if (allowed.find(c) != string::npos) { @@ -831,6 +840,8 @@ audio_channel_types (list mapped, int channels) case dcp::Channel::BSR: ++non_lfe; break; + case dcp::Channel::LC: + case dcp::Channel::RC: case dcp::Channel::HI: case dcp::Channel::VI: case dcp::Channel::MOTION_DATA: @@ -957,7 +968,7 @@ copy_in_bits (boost::filesystem::path from, boost::filesystem::path to, std::fun std::vector buffer(chunk); - boost::uintmax_t const total = boost::filesystem::file_size (from); + auto const total = dcp::filesystem::file_size(from); boost::uintmax_t remaining = total; while (remaining) { @@ -1029,7 +1040,7 @@ default_font_file () boost::filesystem::path liberation_normal; try { liberation_normal = resources_path() / "LiberationSans-Regular.ttf"; - if (!boost::filesystem::exists (liberation_normal)) { + if (!dcp::filesystem::exists(liberation_normal)) { /* Hack for unit tests */ liberation_normal = resources_path() / "fonts" / "LiberationSans-Regular.ttf"; } @@ -1037,10 +1048,10 @@ default_font_file () } - if (!boost::filesystem::exists(liberation_normal)) { + if (!dcp::filesystem::exists(liberation_normal)) { liberation_normal = "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf"; } - if (!boost::filesystem::exists(liberation_normal)) { + if (!dcp::filesystem::exists(liberation_normal)) { liberation_normal = "/usr/share/fonts/liberation-sans/LiberationSans-Regular.ttf"; } @@ -1076,6 +1087,69 @@ error_details(boost::system::error_code ec) bool contains_assetmap(boost::filesystem::path dir) { - return boost::filesystem::is_regular_file(dir / "ASSETMAP") || boost::filesystem::is_regular_file(dir / "ASSETMAP.xml"); + return dcp::filesystem::is_regular_file(dir / "ASSETMAP") || dcp::filesystem::is_regular_file(dir / "ASSETMAP.xml"); +} + + +string +word_wrap(string input, int columns) +{ + icu::Locale locale; + UErrorCode status = U_ZERO_ERROR; + auto iter = icu::BreakIterator::createLineInstance(locale, status); + dcp::ScopeGuard sg = [iter]() { delete iter; }; + if (U_FAILURE(status)) { + return input; + } + + auto input_icu = icu::UnicodeString::fromUTF8(icu::StringPiece(input)); + iter->setText(input_icu); + + int position = 0; + string output; + while (position < input_icu.length()) { + int end_of_line = iter->preceding(position + columns + 1); + icu::UnicodeString line; + if (end_of_line <= position) { + /* There's no good line-break position; just break in the middle of a word */ + line = input_icu.tempSubString(position, columns); + position += columns; + } else { + line = input_icu.tempSubString(position, end_of_line - position); + position = end_of_line; + } + line.toUTF8String(output); + output += "\n"; + } + + return output; +} + + +string +screen_names_to_string(vector names) +{ + if (names.empty()) { + return {}; + } + + auto number = [](string const& s) { + return s.find_first_not_of("0123456789") == string::npos; + }; + + if (std::find_if(names.begin(), names.end(), [number](string const& s) { return !number(s); }) == names.end()) { + std::sort(names.begin(), names.end(), [](string const& a, string const& b) { + return dcp::raw_convert(a) < dcp::raw_convert(b); + }); + } else { + std::sort(names.begin(), names.end()); + } + + string result; + for (auto const& name: names) { + result += name + ", "; + } + + return result.substr(0, result.length() - 2); }