Add DiskWriterBackendResponse::write_to_nanomsg() and use it

everywhere.  In the process, use raw_convert() on both ends
to avoid any locale-based problems with floating point number
separators.

1 files changed, 43 insertions, 4 deletions

diff --git a/src/lib/disk_writer_messages.cc b/src/lib/disk_writer_messages.cc
index e42e80ec6..a862f2fc6 100644
--- a/src/lib/disk_writer_messages.cc
+++ b/src/lib/disk_writer_messages.cc
@@ -22,8 +22,10 @@
 #include "dcpomatic_assert.h"
 #include "disk_writer_messages.h"
 #include "nanomsg.h"
+#include <dcp/raw_convert.h>
 
 
+using std::string;
 using boost::optional;
 
 
@@ -39,18 +41,18 @@ DiskWriterBackEndResponse::read_from_nanomsg(Nanomsg& nanomsg, int timeout)
 	} else if (*s == DISK_WRITER_ERROR) {
 		auto const m = nanomsg.receive(500);
 		auto const n = nanomsg.receive(500);
-		return DiskWriterBackEndResponse::error(m.get_value_or(""), dcp::locale_convert<int>(n.get_value_or("0")));
+		return DiskWriterBackEndResponse::error(m.get_value_or(""), dcp::raw_convert<int>(n.get_value_or("0")));
 	} else if (*s == DISK_WRITER_PONG) {
 		return DiskWriterBackEndResponse::pong();
 	} else if (*s == DISK_WRITER_FORMAT_PROGRESS) {
 		auto progress = nanomsg.receive(500);
-		return DiskWriterBackEndResponse::format_progress(dcp::locale_convert<float>(progress.get_value_or("0")));
+		return DiskWriterBackEndResponse::format_progress(dcp::raw_convert<float>(progress.get_value_or("0")));
 	} else if (*s == DISK_WRITER_COPY_PROGRESS) {
 		auto progress = nanomsg.receive(500);
-		return DiskWriterBackEndResponse::copy_progress(dcp::locale_convert<float>(progress.get_value_or("0")));
+		return DiskWriterBackEndResponse::copy_progress(dcp::raw_convert<float>(progress.get_value_or("0")));
 	} else if (*s == DISK_WRITER_VERIFY_PROGRESS) {
 		auto progress = nanomsg.receive(500);
-		return DiskWriterBackEndResponse::verify_progress(dcp::locale_convert<float>(progress.get_value_or("0")));
+		return DiskWriterBackEndResponse::verify_progress(dcp::raw_convert<float>(progress.get_value_or("0")));
 	} else {
 		DCPOMATIC_ASSERT(false);
 	}
@@ -58,3 +60,40 @@ DiskWriterBackEndResponse::read_from_nanomsg(Nanomsg& nanomsg, int timeout)
 	return {};
 }
 
+
+/** @return true if the message was sent, false if there was a timeout */
+bool
+DiskWriterBackEndResponse::write_to_nanomsg(Nanomsg& nanomsg, int timeout) const
+{
+	string message;
+
+	switch (_type)
+	{
+		case Type::OK:
+			message = String::compose("%1\n", DISK_WRITER_OK);
+			break;
+		case Type::ERROR:
+			message = String::compose("%1\n%2\n%3\n", DISK_WRITER_ERROR, _error_message, _error_number);
+			break;
+		case Type::PONG:
+			message = String::compose("%1\n", DISK_WRITER_PONG);
+			break;
+		case Type::FORMAT_PROGRESS:
+			message = String::compose("%1\n", DISK_WRITER_FORMAT_PROGRESS);
+			message += dcp::raw_convert<string>(_progress) + "\n";
+			break;
+		case Type::COPY_PROGRESS:
+			message = String::compose("%1\n", DISK_WRITER_COPY_PROGRESS);
+			message += dcp::raw_convert<string>(_progress) + "\n";
+			break;
+		case Type::VERIFY_PROGRESS:
+			message = String::compose("%1\n", DISK_WRITER_VERIFY_PROGRESS);
+			message += dcp::raw_convert<string>(_progress) + "\n";
+			break;
+	}
+
+
+	return nanomsg.send(message, timeout);
+}
+
+