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/audio_decoder.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/audio_decoder.cc')
| -rw-r--r-- | src/lib/audio_decoder.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc index 60b0f07ad..9dd57f32a 100644 --- a/src/lib/audio_decoder.cc +++ b/src/lib/audio_decoder.cc @@ -25,7 +25,6 @@ #include "dcpomatic_log.h" #include "log.h" #include "resampler.h" -#include "compose.hpp" #include <iostream> #include "i18n.h" @@ -84,7 +83,7 @@ AudioDecoder::emit(shared_ptr<const Film> film, AudioStreamPtr stream, shared_pt if (need_reset) { LOG_GENERAL ( - "Reset audio position: was %1, new data at %2, slack: %3 frames (more than threshold %4)", + "Reset audio position: was {}, new data at {}, slack: {} frames (more than threshold {})", _positions[stream], time.frames_round(resampled_rate), std::abs(_positions[stream] - time.frames_round(resampled_rate)), @@ -107,7 +106,7 @@ AudioDecoder::emit(shared_ptr<const Film> film, AudioStreamPtr stream, shared_pt } else { if (stream->frame_rate() != resampled_rate) { LOG_GENERAL ( - "Creating new resampler from %1 to %2 with %3 channels", + "Creating new resampler from {} to {} with {} channels", stream->frame_rate(), resampled_rate, stream->channels() @@ -128,7 +127,7 @@ AudioDecoder::emit(shared_ptr<const Film> film, AudioStreamPtr stream, shared_pt * here. */ if (resampler->channels() != data->channels()) { - LOG_WARNING("Received audio data with an unexpected channel count of %1 instead of %2", data->channels(), resampler->channels()); + LOG_WARNING("Received audio data with an unexpected channel count of {} instead of {}", data->channels(), resampler->channels()); auto data_copy = data->clone(); data_copy->set_channels(resampler->channels()); data = resampler->run(data_copy); |