diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-12-30 15:43:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-01-05 12:58:13 +0100 |
| commit | b03f2277a205ff7e7cdaa12c6e52322ea474a7af (patch) | |
| tree | d6067668105b2f0c6d0651bd1b8bd4186e0b8893 /src/lib/ffmpeg_audio_stream.cc | |
| parent | e46ff5f1cf168fb73ea930f3e8469165e5f6644e (diff) | |
Bump libdcp for raw_convert changes.
raw_convert<string> is gone, so here we use fmt::{to_string,format} instead.
Other raw_converts now use fast_float.
Diffstat (limited to 'src/lib/ffmpeg_audio_stream.cc')
| -rw-r--r-- | src/lib/ffmpeg_audio_stream.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc index 24f96b889..e0da3a22d 100644 --- a/src/lib/ffmpeg_audio_stream.cc +++ b/src/lib/ffmpeg_audio_stream.cc @@ -20,17 +20,16 @@ #include "ffmpeg_audio_stream.h" -#include <dcp/raw_convert.h> #include <dcp/warnings.h> LIBDCP_DISABLE_WARNINGS #include <libxml++/libxml++.h> LIBDCP_ENABLE_WARNINGS #include <libcxml/cxml.h> +#include <fmt/format.h> using std::string; using boost::optional; -using dcp::raw_convert; using namespace dcpomatic; @@ -55,16 +54,16 @@ void FFmpegAudioStream::as_xml(xmlpp::Element* root) const { FFmpegStream::as_xml (root); - cxml::add_text_child(root, "FrameRate", raw_convert<string>(frame_rate())); - cxml::add_text_child(root, "Length", raw_convert<string>(length())); + cxml::add_text_child(root, "FrameRate", fmt::to_string(frame_rate())); + cxml::add_text_child(root, "Length", fmt::to_string(length())); mapping().as_xml(cxml::add_child(root, "Mapping")); if (first_audio) { - cxml::add_text_child(root, "FirstAudio", raw_convert<string>(first_audio.get().get())); + cxml::add_text_child(root, "FirstAudio", fmt::to_string(first_audio.get().get())); } if (codec_name) { cxml::add_text_child(root, "CodecName", codec_name.get()); } if (bit_depth()) { - cxml::add_text_child(root, "BitDepth", raw_convert<string>(bit_depth().get())); + cxml::add_text_child(root, "BitDepth", fmt::to_string(bit_depth().get())); } } |
