Replace simple uses of raw_convert<string> with fmt.fmt

1 files changed, 9 insertions, 8 deletions

diff --git a/src/cpl.cc b/src/cpl.cc
index 1f20d13e..6c6cf50e 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -53,6 +53,7 @@
 #include "util.h"
 #include "warnings.h"
 #include "xml.h"
+#include <fmt/format.h>
 LIBDCP_DISABLE_WARNINGS
 #include <asdcp/Metadata.h>
 LIBDCP_ENABLE_WARNINGS
@@ -356,7 +357,7 @@ CPL::maybe_write_composition_metadata_asset (xmlpp::Element* node) const
 
 	auto mp = _reels.front()->main_picture();
 	meta->add_child("EditRate")->add_child_text(mp->edit_rate().as_string());
-	meta->add_child("IntrinsicDuration")->add_child_text(raw_convert<string>(mp->intrinsic_duration()));
+	meta->add_child("IntrinsicDuration")->add_child_text(fmt::to_string(mp->intrinsic_duration()));
 
 	auto fctt = meta->add_child("FullContentTitleText", "meta");
 	if (_full_content_title_text && !_full_content_title_text->empty()) {
@@ -372,7 +373,7 @@ CPL::maybe_write_composition_metadata_asset (xmlpp::Element* node) const
 
 	if (_version_number) {
 		xmlpp::Element* vn = meta->add_child("VersionNumber", "meta");
-		vn->add_child_text(raw_convert<string>(*_version_number));
+		vn->add_child_text(fmt::to_string(*_version_number));
 		if (_status) {
 			vn->set_attribute("status", status_to_string(*_status));
 		}
@@ -402,15 +403,15 @@ CPL::maybe_write_composition_metadata_asset (xmlpp::Element* node) const
 	}
 
 	meta->add_child("MainSoundConfiguration", "meta")->add_child_text(*_main_sound_configuration);
-	meta->add_child("MainSoundSampleRate", "meta")->add_child_text(raw_convert<string>(*_main_sound_sample_rate) + " 1");
+	meta->add_child("MainSoundSampleRate", "meta")->add_child_text(fmt::to_string(*_main_sound_sample_rate) + " 1");
 
 	auto stored = meta->add_child("MainPictureStoredArea", "meta");
-	stored->add_child("Width", "meta")->add_child_text(raw_convert<string>(_main_picture_stored_area->width));
-	stored->add_child("Height", "meta")->add_child_text(raw_convert<string>(_main_picture_stored_area->height));
+	stored->add_child("Width", "meta")->add_child_text(fmt::to_string(_main_picture_stored_area->width));
+	stored->add_child("Height", "meta")->add_child_text(fmt::to_string(_main_picture_stored_area->height));
 
 	auto active = meta->add_child("MainPictureActiveArea", "meta");
-	active->add_child("Width", "meta")->add_child_text(raw_convert<string>(_main_picture_active_area->width));
-	active->add_child("Height", "meta")->add_child_text(raw_convert<string>(_main_picture_active_area->height));
+	active->add_child("Width", "meta")->add_child_text(fmt::to_string(_main_picture_active_area->width));
+	active->add_child("Height", "meta")->add_child_text(fmt::to_string(_main_picture_active_area->height));
 
 	optional<string> first_subtitle_language;
 	for (auto i: _reels) {
@@ -509,7 +510,7 @@ CPL::maybe_write_composition_metadata_asset (xmlpp::Element* node) const
 						ch->add_child("MCATagName", "r1")->add_child_text(buffer);
 					}
 					if (!channel->MCAChannelID.empty()) {
-						ch->add_child("MCAChannelID", "r1")->add_child_text(raw_convert<string>(channel->MCAChannelID.get()));
+						ch->add_child("MCAChannelID", "r1")->add_child_text(fmt::to_string(channel->MCAChannelID.get()));
 					}
 					if (!channel->RFC5646SpokenLanguage.empty()) {
 						channel->RFC5646SpokenLanguage.get().EncodeString(buffer, sizeof(buffer));