diff options
| author | cah <cth@carlh.net> | 2025-07-10 22:47:19 +0200 |
|---|---|---|
| committer | cah <cth@carlh.net> | 2025-07-10 22:47:19 +0200 |
| commit | 4be4e97abf911e7633172ada950d107a3ed28834 (patch) | |
| tree | c9deceb5f3684fa081db0613da88264732093fcb /src/lib/content_factory.cc | |
| parent | 727c1aa7da8b325dfa38c8443b1dd356acaf6ec3 (diff) | |
| parent | 42bde2d97039f6d0d645d83db90612d18ebf225a (diff) | |
Merge branch 'compose-to-fmt-take2'
This removes all uses of String::compose, replacing them with fmt and
updating the i18n strings where required.
Diffstat (limited to 'src/lib/content_factory.cc')
| -rw-r--r-- | src/lib/content_factory.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index fa3f0876c..5d0fe8c3c 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -39,7 +39,6 @@ #include "string_text_file_content.h" #include "util.h" #include "video_mxf_content.h" -#include "compose.hpp" #include <libcxml/cxml.h> #include <dcp/filesystem.h> #include <dcp/smpte_text_asset.h> @@ -117,7 +116,7 @@ content_factory (boost::filesystem::path path) if (dcp::filesystem::is_directory(path)) { - LOG_GENERAL ("Look in directory %1", path); + LOG_GENERAL("Look in directory {}", path.string()); if (dcp::filesystem::is_empty(path)) { return content; @@ -130,17 +129,17 @@ content_factory (boost::filesystem::path path) int read = 0; for (dcp::filesystem::directory_iterator i(path); i != dcp::filesystem::directory_iterator() && read < 10; ++i) { - LOG_GENERAL ("Checking file %1", i->path()); + LOG_GENERAL("Checking file {}", i->path().string()); if (boost::starts_with(i->path().filename().string(), ".")) { /* We ignore hidden files */ - LOG_GENERAL ("Ignored %1 (starts with .)", i->path()); + LOG_GENERAL("Ignored {} (starts with .)", i->path().string()); continue; } if (!dcp::filesystem::is_regular_file(i->path())) { /* Ignore things which aren't files (probably directories) */ - LOG_GENERAL ("Ignored %1 (not a regular file)", i->path()); + LOG_GENERAL("Ignored {} (not a regular file)", i->path().string()); continue; } |