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.

3 files changed, 16 insertions, 15 deletions

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 19d23c6cc..17ee0fb21 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -31,7 +31,7 @@
 #include "lib/util.h"
 #include <dcp/file.h>
 #include <dcp/filesystem.h>
-#include <dcp/raw_convert.h>
+#include <fmt/format.h>
 
 
 using std::function;
@@ -982,7 +982,7 @@ SoundPage::config_changed ()
 
 	vector<NamedChannel> output;
 	for (int i = 0; i < channels; ++i) {
-		output.push_back (NamedChannel(dcp::raw_convert<string>(i), i));
+		output.push_back(NamedChannel(fmt::to_string(i), i));
 	}
 	_map->set_output_channels (output);
 
diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 22899ddc9..1116e9d87 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -30,6 +30,7 @@
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 LIBDCP_ENABLE_WARNINGS
+#include <fmt/format.h>
 #include <boost/signals2.hpp>
 
 
@@ -79,10 +80,10 @@ public:
 	{
 		auto const hmsf = t.split (fps);
 
-		checked_set (_hours, dcp::raw_convert<std::string>(hmsf.h));
-		checked_set (_minutes, dcp::raw_convert<std::string>(hmsf.m));
-		checked_set (_seconds, dcp::raw_convert<std::string>(hmsf.s));
-		checked_set (_frames, dcp::raw_convert<std::string>(hmsf.f));
+		checked_set(_hours, fmt::to_string(hmsf.h));
+		checked_set(_minutes, fmt::to_string(hmsf.m));
+		checked_set(_seconds, fmt::to_string(hmsf.s));
+		checked_set(_frames, fmt::to_string(hmsf.f));
 
 		checked_set (_fixed, t.timecode (fps));
 	}
@@ -91,10 +92,10 @@ public:
 	{
 		auto hmsf = t.split (fps);
 
-		_hours->SetHint (std_to_wx(dcp::raw_convert<std::string>(hmsf.h)));
-		_minutes->SetHint (std_to_wx(dcp::raw_convert<std::string>(hmsf.m)));
-		_seconds->SetHint (std_to_wx(dcp::raw_convert<std::string>(hmsf.s)));
-		_frames->SetHint (std_to_wx(dcp::raw_convert<std::string>(hmsf.f)));
+		_hours->SetHint(std_to_wx(fmt::to_string(hmsf.h)));
+		_minutes->SetHint(std_to_wx(fmt::to_string(hmsf.m)));
+		_seconds->SetHint(std_to_wx(fmt::to_string(hmsf.s)));
+		_frames->SetHint(std_to_wx(fmt::to_string(hmsf.f)));
 	}
 
 	void set_maximum(dcpomatic::HMSF maximum)
diff --git a/src/wx/verify_dcp_result_panel.cc b/src/wx/verify_dcp_result_panel.cc
index d6232f984..36905bf13 100644
--- a/src/wx/verify_dcp_result_panel.cc
+++ b/src/wx/verify_dcp_result_panel.cc
@@ -24,7 +24,6 @@
 #include "verify_dcp_result_panel.h"
 #include "wx_util.h"
 #include "lib/verify_dcp_job.h"
-#include <dcp/raw_convert.h>
 #include <dcp/verify.h>
 #include <dcp/verify_report.h>
 #include <dcp/warnings.h>
@@ -32,6 +31,7 @@ LIBDCP_DISABLE_WARNINGS
 #include <wx/richtext/richtextctrl.h>
 #include <wx/notebook.h>
 LIBDCP_ENABLE_WARNINGS
+#include <fmt/format.h>
 #include <boost/algorithm/string.hpp>
 
 
@@ -111,7 +111,7 @@ VerifyDCPResultPanel::fill(shared_ptr<VerifyDCPJob> job)
 			message.Replace(char_to_wx("%calculated_hash"), std_to_wx(note.calculated_hash().get()));
 		}
 		if (note.frame()) {
-			message.Replace(char_to_wx("%frame"), std_to_wx(dcp::raw_convert<string>(note.frame().get())));
+			message.Replace(char_to_wx("%frame"), std_to_wx(fmt::to_string(note.frame().get())));
 			message.Replace(
 				char_to_wx("%timecode"),
 				std_to_wx(
@@ -125,13 +125,13 @@ VerifyDCPResultPanel::fill(shared_ptr<VerifyDCPJob> job)
 			message.Replace(char_to_wx("%f"), std_to_wx(note.file()->filename().string()));
 		}
 		if (note.line()) {
-			message.Replace(char_to_wx("%l"), std_to_wx(dcp::raw_convert<string>(note.line().get())));
+			message.Replace(char_to_wx("%l"), std_to_wx(fmt::to_string(note.line().get())));
 		}
 		if (note.component()) {
-			message.Replace(char_to_wx("%component"), std_to_wx(dcp::raw_convert<string>(note.component().get())));
+			message.Replace(char_to_wx("%component"), std_to_wx(fmt::to_string(note.component().get())));
 		}
 		if (note.size()) {
-			message.Replace(char_to_wx("%size"), std_to_wx(dcp::raw_convert<string>(note.size().get())));
+			message.Replace(char_to_wx("%size"), std_to_wx(fmt::to_string(note.size().get())));
 		}
 		if (note.id()) {
 			message.Replace(char_to_wx("%id"), std_to_wx(note.id().get()));