From b03f2277a205ff7e7cdaa12c6e52322ea474a7af Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 30 Dec 2024 15:43:14 +0100 Subject: Bump libdcp for raw_convert changes. raw_convert is gone, so here we use fmt::{to_string,format} instead. Other raw_converts now use fast_float. --- src/lib/ffmpeg_audio_stream.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/lib/ffmpeg_audio_stream.cc') 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 #include LIBDCP_DISABLE_WARNINGS #include LIBDCP_ENABLE_WARNINGS #include +#include 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(frame_rate())); - cxml::add_text_child(root, "Length", raw_convert(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(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(bit_depth().get())); + cxml::add_text_child(root, "BitDepth", fmt::to_string(bit_depth().get())); } } -- cgit v1.2.3